tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 30 Apr 2006 16:30:39 -0700
changeset 2166 d0c02b4dce9a
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
do not check sys.argv from localrepo when running hooks. instead add traceback field to ui class.
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