[Unison-hackers] [unison-svn] r275 - in branches/2.27: doc src

[Benjamin C. Pierce]

Author: bcpierce
Date: 2008-04-29 10:08:53 -0400 (Tue, 29 Apr 2008)
New Revision: 275

Modified:
   branches/2.27/doc/unison-manual.tex
   branches/2.27/src/RECENTNEWS
   branches/2.27/src/mkProjectInfo.ml
Log:
Tiny edit to docs


Modified: branches/2.27/doc/unison-manual.tex
===================================================================
--- branches/2.27/doc/unison-manual.tex	2008-04-29 14:07:12 UTC (rev 274)
+++ branches/2.27/doc/unison-manual.tex	2008-04-29 14:08:53 UTC (rev 275)
@@ -1678,7 +1678,8 @@
 A large number of external merging programs are available.  
 For example, on Unix systems setting the \verb|merge| preference to
 \begin{verbatim}
-    merge = Name *.txt -> diff3 CURRENT1 CURRENTARCH CURRENT2 -m > NEW
+    merge = Name *.txt -> diff3 -m CURRENT1 CURRENTARCH CURRENT2
+                            > NEW || echo "differences detected"
 \end{verbatim}
 \noindent
 will tell Unison to use the external \verb|diff3| program for merging.  

Modified: branches/2.27/src/RECENTNEWS
===================================================================
--- branches/2.27/src/RECENTNEWS	2008-04-29 14:07:12 UTC (rev 274)
+++ branches/2.27/src/RECENTNEWS	2008-04-29 14:08:53 UTC (rev 275)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.27.65
+
+Tiny edit to docs
+
+-------------------------------
 CHANGES FROM VERSION 2.27.64
 
 * Minor 

Modified: branches/2.27/src/mkProjectInfo.ml
===================================================================
--- branches/2.27/src/mkProjectInfo.ml	2008-04-29 14:07:12 UTC (rev 274)
+++ branches/2.27/src/mkProjectInfo.ml	2008-04-29 14:08:53 UTC (rev 275)
@@ -72,3 +72,4 @@
 
 
 
+