tests/test-merge2.out
author mason@suse.com
Tue, 24 Jan 2006 15:02:10 +1300
changeset 1637 3b1b44b917f4
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Add new bdiff based unidiff generation.
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