tests/test-merge2.out
author mpm@selenic.com
Tue, 23 Aug 2005 12:46:43 -0700
changeset 994 88c15682d9b0
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Fix callers to file.revision to use file.read This was causing unchanged files to show up as modified.
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