##// END OF EJS Templates
Clarified message when nothing to merge is seen....
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
Thomas Arendsen Hein -
r2548:0229ff95 default
Show More
Name Size Modified Last Commit Author
/ mercurial
hgweb
__init__.py Loading ...
appendfile.py Loading ...
archival.py Loading ...
bdiff.c Loading ...
bundlerepo.py Loading ...
byterange.py Loading ...
changegroup.py Loading ...
changelog.py Loading ...
commands.py Loading ...
demandload.py Loading ...
dirstate.py Loading ...
fancyopts.py Loading ...
filelog.py Loading ...
hg.py Loading ...
httprangereader.py Loading ...
httprepo.py Loading ...
i18n.py Loading ...
keepalive.py Loading ...
localrepo.py Loading ...
lock.py Loading ...
lsprof.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 ...
sshserver.py Loading ...
statichttprepo.py Loading ...
templater.py Loading ...
transaction.py Loading ...
ui.py Loading ...
util.py Loading ...
util_win32.py Loading ...
version.py Loading ...