[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

diff3 on OpenBSD 2.9

From: Johan Lindh <johan_at_linkdata.se>
Date: 2002-03-20 17:05:04 CET

This is a non-conflicting change to line 1.
This is line 2.
This is line 3.
This is line 4.
This is line 5.
This is line 6.
This is line 7.
This is line 8.
This is line 9.
This is line 10 plus some, but still no trailing newline.XXX
 
(If the XXX appears at the end of line 10, then your diff3 does not
add a spurious newline. But if the XXX appears on its own line, then
diff3 added a newline not present in any of the original data; in
which case, please mail dev@subversion.tigris.org stating your
operating system and the output of 'diff3 --version'.)
 
[joli@ns ~] diff3 --version
diff3 - GNU diffutils version 2.7
[joli@ns ~] uname -a
OpenBSD ns 2.9 GENERIC#653 i386

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 20 17:15:51 2002

This is an archived mail posted to the Subversion Dev mailing list.