##// END OF EJS Templates
merge: handle linear update to symlink correctly (issue3316)...
merge: handle linear update to symlink correctly (issue3316) This fixes a regression introduced by fcf66193b186. If no file-level merge is needed, we can update flags directly, otherwise we have a conflict to resolve in filemerge.
Matt Mackall -
r16255:ca5cc297 stable
Show More
Name Size Modified Last Commit Author
/ hgext
convert
highlight
inotify
largefiles
zeroconf
__init__.py Loading ...
acl.py Loading ...
bugzilla.py Loading ...
children.py Loading ...
churn.py Loading ...
color.py Loading ...
eol.py Loading ...
extdiff.py Loading ...
fetch.py Loading ...
gpg.py Loading ...
graphlog.py Loading ...
hgcia.py Loading ...
hgk.py Loading ...
interhg.py Loading ...
keyword.py Loading ...
mq.py Loading ...
notify.py Loading ...
pager.py Loading ...
patchbomb.py Loading ...
progress.py Loading ...
purge.py Loading ...
rebase.py Loading ...
record.py Loading ...
relink.py Loading ...
schemes.py Loading ...
share.py Loading ...
transplant.py Loading ...
win32mbcs.py Loading ...
win32text.py Loading ...