Mads Kiilerich
2a09e8d38f
tests: fix test markup in test-merge-types.t
...
d727e5b3202b introduced some tests that because of incorrect indentation wasn't
run.
2012-07-05 00:35:42 +02:00
Thomas Arendsen Hein
a93a526aeb
test-merge-types: allow different output with existing hgmerge (issue3346)
...
Because hgmerge was meant to be adjusted to personal needs, there may be
many remaining copies in people's $PATH.
2012-04-04 11:18:42 +02:00
Matt Mackall
5eda7202ad
merge: handle linear update to symlink correctly (issue3316)
...
This fixes a regression introduced by df049e784ab6. If no file-level
merge is needed, we can update flags directly, otherwise we have a
conflict to resolve in filemerge.
2012-03-13 16:28:08 -05:00
Martin Geisler
ae8ca6aff5
merge: make debug output easier to read
...
I always found it hard to figure out what the debug code meant without
the separators.
2011-12-09 17:34:53 +01:00
Mads Kiilerich
adfff587c7
tests: use 'hghave execbit' for tests that manipulate x bit in file system
2011-11-07 03:14:54 +01:00
Mads Kiilerich
4838bfb2c4
tests: use 'hghave symlink' for tests using symlinks
2011-11-07 03:14:54 +01:00
Sune Foldager
843894f4b3
tests: remove exec bit from .t files
2010-09-14 16:03:10 +02:00
Adrian Buehlmann
79059e20c1
combine tests
2010-09-14 12:20:51 +02:00
