Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 21922:50e20154cb68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -4 tip
age author description
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
less more | (0) -30 -10 -4 tip