tests/test-merge3.out
author Brodie Rao <me+hg@dackz.net>
Sun, 14 Feb 2010 17:08:52 -0500
changeset 10475 2253715fde97
parent 1747 91c56c427171
permissions -rw-r--r--
color: don't crash on invalid status codes (issue2036) If an unknown file with a newline appears in the status output, color shouldn't raise a KeyError trying to parse second line in the filename.
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