Commit Graph

5 Commits

Author SHA1 Message Date
Benoit Boissinot
cec92b2bd7 fix traceback of extdiff after a merge
- files that comes from a different branch are marked as modified
  but aren't present in the original manifest
- add a testcase for extdiff and for regular diff
2006-10-11 16:35:09 +02:00
Thomas Arendsen Hein
a1f1b33ecb Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
and add documentation for this.
2006-08-22 10:08:42 +02:00
Danek Duvall
c6b9a108d2 Solaris portability fixes 2006-08-18 10:24:04 -07:00
Thomas Arendsen Hein
d4d1d2313a Fixed test-extdiff.
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
2006-08-15 16:04:47 +02:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00