log

age author description
Fri, 18 Jul 2014 23:15:28 -0500 Matt Mackall commiteditor: refactor default extramsg
Thu, 26 Jun 2014 01:20:25 +0200 Angel Ezquerra filemerge: add internal:tagmerge merge tool
Fri, 18 Jul 2014 21:49:52 -0500 Matt Mackall filemerge: use non-minimal conflict marker regions (BC)
Mon, 09 Jun 2014 03:49:07 -0700 Pierre-Yves David test: use more elaborated content in ``test-conflict.t``
Fri, 18 Jul 2014 17:52:18 -0500 Matt Mackall run-tests: make --view work again
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety