Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 34560:1248aa48cac9
age | author | description |
---|---|---|
Thu, 05 Oct 2017 08:03:57 -0700 | Mark Thomas | merge: improve comments in mergestate._makerecords |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) |