tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Sat, 12 Aug 2006 13:51:14 -0700
changeset 2868 81f351c5264d
parent 2175 b2ae81a7df29
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.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)