tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 30 Apr 2006 22:46:54 +0200
changeset 2169 4564794b6f55
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Combine catching exceptions added in dd4ec4576cc8 in one except statement.
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