Mercurial > hg
log mercurial/merge.py @ 36306:3496bffe266d
age | author | description |
---|---|---|
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 |
Tue, 06 Feb 2018 22:36:38 +0900 | Yuya Nishihara | subrepo: split non-core functions to new module |
Wed, 17 Jan 2018 17:07:55 +0100 | Boris Feld | atomicupdate: add an experimental option to use atomictemp when updating |
Wed, 27 Dec 2017 13:53:21 -0600 | Phil Cohen | merge: raise before running mergedriver if using IMM |