tests/test-merge3.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 21 Mar 2006 12:54:32 +0100
changeset 1984 df7436f439a0
parent 1747 91c56c427171
permissions -rw-r--r--
Improved ui.edit(): - Use descriptive name for temporary file: hg-editor-*.txt - Don't import tempfile in the method, but use demandload() - Remove tempfile file even if editor aborts.
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