tests/test-merge3.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 14 Apr 2008 14:34:38 +0200
changeset 6548 962eb403165b
parent 1747 91c56c427171
permissions -rw-r--r--
replace usage of os.popen() with util.popen() To make this possible, I added a mode parameter to both implementations of util.popen(), defaulting to 'r' (as it does in the Python stdlib).
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
removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
     2
nothing changed