##// END OF EJS Templates
merge: check for untracked files more precisely (issue3400)...
merge: check for untracked files more precisely (issue3400) This fixes the regression, but still leaves the long-standing issue that merge doesn't cope with trying to merge files and directories.
Matt Mackall -
r16534:11212bab stable
Show More
Name Size Modified Last Commit Author
/ mercurial / help
config.txt Loading ...
dates.txt Loading ...
diffs.txt Loading ...
environment.txt Loading ...
extensions.txt Loading ...
filesets.txt Loading ...
glossary.txt Loading ...
hgignore.txt Loading ...
hgweb.txt Loading ...
merge-tools.txt Loading ...
multirevs.txt Loading ...
patterns.txt Loading ...
phases.txt Loading ...
revisions.txt Loading ...
revsets.txt Loading ...
subrepos.txt Loading ...
templates.txt Loading ...
urls.txt Loading ...