##// END OF EJS Templates
Fix up some bugs introduced by recent merge changes...
Fix up some bugs introduced by recent merge changes - use new changed list to track what files actually got new revlog entries at commit/rawcommit time - when updating a file during a merge, don't mark it as completely unchanged - handle file not being in parent 1 in status
mpm@selenic.com -
r992:f859e9cb 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 ...