tests/test-merge3.out
author Mads Kiilerich <mads@kiilerich.com>
Thu, 27 Nov 2008 00:57:30 +0100
changeset 7428 fdcde929ce4f
parent 1747 91c56c427171
permissions -rw-r--r--
tests: use killdaemons in hgweb tests hgweb tests often failed on my system because the serve port wasn't free when a new hgweb was started; the killed hg wasn't completely dead yet. Now we use killdaemons which waits for the process to die.
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