Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 37107:71543b942eea
| age | author | description |
|---|---|---|
| Mon, 05 Mar 2018 00:02:13 -0500 | Gregory Szorc | merge: return an attrs class from update() and applyupdates() |
| Thu, 22 Mar 2018 22:58:31 -0400 | Matt Harbison | merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker |
| Thu, 22 Mar 2018 22:56:29 -0400 | Matt Harbison | merge: pconvert paths in _unknowndirschecker before dirstate-normalizing |
| Fri, 02 Mar 2018 02:44:49 +0530 | Pulkit Goyal | py3: slice over bytes to prevent getting ascii values |
| Wed, 28 Feb 2018 21:44:28 +0530 | Pulkit Goyal | py3: make sure we write in mergestate in bytes mode |
| Sun, 18 Feb 2018 14:53:55 -0500 | Augie Fackler | merge: make a copy of dict.items() before mutating the dict during iteration |
| Tue, 13 Feb 2018 23:37:58 -0500 | Augie Fackler | merge: coerce nodes to bytes, not str |