Mercurial > public > mercurial-scm > hg-stable

log mercurial/simplemerge.py @ 27785:ba427b51f1d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -10 -6 tip
age author description
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Wed, 12 Aug 2015 08:53:01 -0400 Jordi Guti?rrez Hermoso simplemerge: enable option to resolve conflicts one way
Sun, 16 Aug 2015 00:00:34 +0200 Erik Huelsmann simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers
Sat, 08 Aug 2015 19:54:11 -0700 Gregory Szorc simplemerge: use absolute_import
Thu, 07 Aug 2014 12:51:45 -0400 Jordi Guti?rrez Hermoso simplemerge: remove dead code
less more | (0) -10 -6 tip