Mercurial > hg
graph
-
merge: skip subrepo state, update hooks, and updating the dirstate in IMMFri, 01 Dec 2017 00:07:23 -0800, by Phil Cohen
-
merge: remove calls to flushall()Fri, 01 Dec 2017 00:07:23 -0800, by Phil Cohen
-
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMMFri, 01 Dec 2017 00:07:23 -0800, by Phil Cohen