tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 16 Feb 2006 08:48:31 -0800
changeset 1727 019e6a47a53e
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix names of parent changeset ids in hooks. fix hook part of man page.
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