Mercurial > hg
log
age | author | description |
---|---|---|
Thu, 10 Sep 2015 09:41:11 -0400 | Jordi GutiƩrrez Hermoso | filemerge: add non-interactive :merge-local and :merge-other |
Wed, 12 Aug 2015 08:53:01 -0400 | Jordi GutiƩrrez Hermoso | simplemerge: enable option to resolve conflicts one way |
Wed, 26 Aug 2015 16:27:14 -0500 | Matt Mackall | templater: add new docheader/footer components for XML (issue4135) |