[interchange-cvs] interchange - jon modified dist/lib/UI/usertag/diffmerge.tag

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2002-01-16 02:15:32 GMT
Modified:  dist/lib/UI/usertag diffmerge.tag
Log:
Minor comment fixes.

Revision  Changes    Path
1.2       +3 -3      interchange/dist/lib/UI/usertag/diffmerge.tag


rev 1.2, prev_rev 1.1
Index: diffmerge.tag
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/usertag/diffmerge.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- diffmerge.tag	2001/11/13 20:30:03	1.1
+++ diffmerge.tag	2002/01/16 02:15:32	1.2
@@ -1,5 +1,5 @@
-# This tag uses GNU diff3 to merge two texts blocks that were
-# modified from the same ancestral text together, and marks
+# This tag uses GNU diff3 to merge two text blocks that were
+# modified from the same ancestral text, and marks
 # conflicts that may appear. This is similar to CVS's merging
 # and conflict marking. The names the diff3 manpage uses are:
 #
@@ -18,7 +18,7 @@
 # in the 'result' option where the return code from diff3 will be placed.
 #
 # Set the 'ascii' option to allow for different newline types and
-# ignore whether the last line of the file has a newline.
+# ignore whether the last line of the file ends with a newline.
 #
 # Set the 'safe_data' option to allow raw data to be pulled from the
 # database without escaping left brackets (turning [ into [).