tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 27 Dec 2005 13:12:53 -0600
changeset 1599 f93fde8f5027
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
remove the gpg stuff from hgeditor (superseded by the signing extension) remove the gpg stuff from hgeditor, update the comments to make it clear it can be used to show a diff while commiting
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