tests/test-merge2.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 17 Feb 2006 17:41:18 -0600
changeset 1738 f293ad87f928
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.
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