tests/test-merge2.out
author Vincent Danjean <Vincent.Danjean@ens-lyon.org>
Thu, 12 Jan 2006 06:29:06 +0100
changeset 1614 0952d164030e
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
hgk.py is not a script (no '#!' line needed)
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