##// 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
/ i18n
da.po Loading ...
de.po Loading ...
el.po Loading ...
fr.po Loading ...
hggettext Loading ...
it.po Loading ...
ja.po Loading ...
polib.LICENSE Loading ...
polib.py Loading ...
posplit Loading ...
pt_BR.po Loading ...
ro.po Loading ...
ru.po Loading ...
sv.po Loading ...
zh_CN.po Loading ...
zh_TW.po Loading ...