Mercurial > hg-stable
log
age | author | description |
---|---|---|
Wed, 10 Feb 2016 09:06:08 -0800 | Ryan McElroy | merge: minimize conflicts when common base is not shown (issue4447) |
Wed, 10 Feb 2016 08:25:03 -0800 | Ryan McElroy | merge: introduce method to minimize merge regions |
Tue, 09 Feb 2016 15:25:09 -0800 | Ryan McElroy | merge: add some useful documentation |
Sun, 27 Dec 2015 19:58:11 +0900 | Yuya Nishihara | encoding: backport paranoid escaping from templatefilters.jsonescape() |