log mercurial/filemerge.py @ 22022:2ea6d906cf9b

age author description
Tue, 29 Jul 2014 11:55:01 -0700 Pierre-Yves David merge: use no-minimal for premerge too
Mon, 09 Jun 2014 23:37:36 -0700 Pierre-Yves David merge: refactor labels selection code
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)
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use 'util.ellipsis' to trim custom conflict markers correctly
Sun, 06 Jul 2014 02:56:41 +0900 FUJIWARA Katsunori filemerge: use only the first line of the generated conflict marker for safety
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Thu, 08 May 2014 16:54:23 -0700 Durham Goode merge: add labels parameter from merge.update to filemerge
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Thu, 08 May 2014 16:37:33 -0700 Durham Goode merge: define conflict marker labels in filemerge()
Thu, 17 Apr 2014 14:54:46 +0200 Mads Kiilerich filemerge: better handling of failing remove of temporary files
Wed, 12 Mar 2014 13:15:09 -0400 Augie Fackler filemerge: move from dict() construction to {} literals
Wed, 22 May 2013 17:31:43 -0500 Matt Mackall ui: merge prompt text components into a singe string
Tue, 15 Jan 2013 01:05:11 +0100 Mads Kiilerich merge: warn when internal:merge cannot merge symlinks