Mercurial > hg
log mercurial/default.d/mergetools.rc @ 40524:25732c5678bc
| age | author | description |
|---|---|---|
| Wed, 19 Sep 2018 12:07:52 -0700 | Martin von Zweigbergk | meld: enable auto-merge |
| Sat, 20 Jan 2018 15:33:48 -0800 | Kyle Lippincott | merge: use operation-provided labels (ex: dest/source) in several merge-tools |
| Fri, 16 Oct 2015 11:37:34 +0200 | Mads Kiilerich | mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3 |
| Fri, 27 Feb 2015 21:42:58 +0100 | Mads Kiilerich | merge-tools: configuration for Beyond Compare on OS X |
| Wed, 28 Jan 2015 02:28:38 +0100 | Mads Kiilerich | mergetools: drop incorrect quoting of diffargs variables stable |
| Sun, 19 Oct 2014 03:22:23 +0200 | Mads Kiilerich | config: move mergetools configuration from contrib to default configuration base contrib/mergetools.hgrc@f268f27064bd |