##// END OF EJS Templates
hgmerge: do not use file with markers in tools merging themselves...
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
Radoslaw Szkodzinski -
r1798:d610fe0e default
Show More
Name Size Modified Last Commit Author
/ mercurial
__init__.py Loading ...
bdiff.c Loading ...
byterange.py Loading ...
changelog.py Loading ...
commands.py Loading ...
demandload.py Loading ...
dirstate.py Loading ...
fancyopts.py Loading ...
filelog.py Loading ...
hg.py Loading ...
hgweb.py Loading ...
httprangereader.py Loading ...
httprepo.py Loading ...
i18n.py Loading ...
localrepo.py Loading ...
lock.py Loading ...
manifest.py Loading ...
mdiff.py Loading ...
mpatch.c Loading ...
node.py Loading ...
packagescan.py Loading ...
remoterepo.py Loading ...
repo.py Loading ...
revlog.py Loading ...
sshrepo.py Loading ...
statichttprepo.py Loading ...
transaction.py Loading ...
ui.py Loading ...
util.py Loading ...
version.py Loading ...