tests/test-merge2.out
author Jim Meyering <list+hg@meyering.net>
Fri, 21 Apr 2006 16:09:43 -0700
changeset 2115 fd77b7ee4aac
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
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