Mercurial > hg-stable
log
age | author | description |
---|---|---|
Thu, 10 Sep 2015 13:45:00 -0400 | Augie Fackler | help/config: back out 5f2a1ebd6e78 |
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 |