tests/test-merge2.out
author Peter van Dijk <peter@dataloss.nl>
Wed, 22 Feb 2006 15:42:48 +0100
changeset 1925 c71420b186b0
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
small solaris portability fixes from John Levon <levon@movementarian.org>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     1
adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     2
adding b