##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: demonstrate that rename is followed to wrong parent from merge...
tests: demonstrate that rename is followed to wrong parent from merge This test case shows another way that copies are handled differently between `hg st` (pathcopies()) and `hg co -m` (mergecopies). The reason is that pathcopies() calls _tracefiles(), which checks that the file nodeid of an ancestor matches the file nodeid in the base commit. mergecopies() should probably be doing the same. Differential Revision: https://phab.mercurial-scm.org/D6323
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r42399:618b9ffe default
Show More
9diff.rc
7 lines | 192 B | text/x-stsrc | TextLexer
/ contrib / plan9 / hgrc.d / 9diff.rc
History | Annotation | Raw |Copy content |Copy permalink
# 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