tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Fri, 31 Mar 2006 03:25:35 -0600
changeset 2028 1f1fc418a96c
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
ssh: skip noise generated by remote shell we send a dummy command with known output to get in sync
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