tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 02 Feb 2006 19:22:27 +0100
changeset 1685 60c3a55c61b8
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
extension gpg.py: really raise the exception in case of invalid data
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