tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 18 Oct 2005 17:56:50 -0700
changeset 1398 3f76ac60130d
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
make update quieter when nothing is wrong sometimes when i am going around in my history, i get long lists of errors from the update command. this patch will fix that. i tried to make the code style the same like the rest of the code.
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