Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 36884:ece242db5000
age | author | description |
---|---|---|
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 |
Sun, 11 Feb 2018 13:25:56 -0500 | Matt Harbison | merge: invoke scmutil.fileprefetchhooks() prior to applying updates |
Sun, 11 Feb 2018 13:09:16 -0800 | Gregory Szorc | py3: use bytes() to cast context instances |
Tue, 06 Feb 2018 22:55:02 +0900 | Yuya Nishihara | merge: cut import cycle at merge -> extensions |