##// END OF EJS Templates
commit: get info from mergestate whether a file was merged or not...
commit: get info from mergestate whether a file was merged or not While commiting a merge, the commit code does not know whether a file was merged during `hg merge` or not. This leads the commit code to look for filelog ancestor to choose parents of new filelog created on merge commit. This leads to wrong results in some cases as demonstrated by previous patch. From this patch, we start storing information about merged files in mergestate in stateextras and then use that on commit to detect whether we need to set two parents or not. Differential Revision: https://phab.mercurial-scm.org/D10149

File last commit:

r38257:ead71b15 merge default
r47567:5a0b930c default
Show More
ja.po
0 lines | 1.4 MiB | application/x-gettext
File size 1.4 MiB is bigger then allowed limit 515.6 KiB. Show as raw