##// 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 / templates / coal
header.tmpl Loading ...
map Loading ...