##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Don't mark files with 'm'erge unless we're actually merging branches...
Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.
mpm@selenic.com -
r764:eea96285 default
Show More
Name Size Modified Last Commit Author
/ mercurial
__init__.py Loading ...
bdiff.c Loading ...
byterange.py Loading ...
commands.py Loading ...
demandload.py Loading ...
fancyopts.py Loading ...
hg.py Loading ...
hgweb.py Loading ...
httprangereader.py Loading ...
lock.py Loading ...
mdiff.py Loading ...
mpatch.c Loading ...
revlog.py Loading ...
transaction.py Loading ...
ui.py Loading ...
util.py Loading ...
version.py Loading ...