##// 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

File last commit:

r0:9117c656 default
r992:f859e9cb default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer