tests/test-merge3.out
author Brendan Cully <brendan@kublai.com>
Sat, 12 Aug 2006 13:51:14 -0700
changeset 2868 81f351c5264d
parent 1747 91c56c427171
permissions -rw-r--r--
grep: display correct user/revision for --all in reverse. Also handle multiple occurrences of the same line by storing linestates in an array instead of a dict, and using difflib to compute the difference between linestates.
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