##// END OF EJS Templates
sparse: add test showing `hg merge` is broken while using sparse extension...
sparse: add test showing `hg merge` is broken while using sparse extension This patch adds a test to demonstrate that `hg merge` is broken in some cases while using sparse extension. The case is when you have a file which is: * modified between current wdir parent and merge base * deleted between merge base and merge destination * excluded from sparse checkout Doing `hg merge` results in file not found error. Next patch will fix this. Differential Revision: https://phab.mercurial-scm.org/D3983

File last commit:

r19617:ba89c387 default
r38779:91c405f8 stable
Show More
9diff.rc
7 lines | 192 B | text/x-stsrc | TextLexer
# The 9diff extdiff command generates diff(1) compatible output
# suitable for use with the plumber(4).
[extensions]
extdiff =
[extdiff]
9diff = /bin/mercurial/9diff -cm $parent $child $root