tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 21 Mar 2006 12:45:27 +0100
changeset 1983 ae12a81549a7
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Pass correct username as $HGUSER to hgeditor if "commit -u" is used. And only use the new util.system parameter to set the environment.
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