mercurial at 22028: 6 new changesets

Mercurial Commits hg at intevation.org
Tue Aug 5 19:00:53 CDT 2014


6 new changesets in mercurial:

http://selenic.com/repo/hg//rev/f18830651811
changeset:   22023:f18830651811
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 14:56:25 2014 -0700
summary:     simplemerge: burn "minimal" feature to the ground

http://selenic.com/repo/hg//rev/372ae2745acf
changeset:   22024:372ae2745acf
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 15:10:50 2014 -0700
summary:     simplemerge: support three labels when merging

http://selenic.com/repo/hg//rev/5f22975d320d
changeset:   22025:5f22975d320d
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 15:12:22 2014 -0700
summary:     filemerge: drop extra white space

http://selenic.com/repo/hg//rev/6966542768ff
changeset:   22026:6966542768ff
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 15:17:38 2014 -0700
summary:     filemerge: allow the formatting of three labels instead of two

http://selenic.com/repo/hg//rev/b98e5c7afc70
changeset:   22027:b98e5c7afc70
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Aug 05 15:09:54 2014 -0700
summary:     internal:merge: update documentation

http://selenic.com/repo/hg//rev/3d0572ab3b4a
changeset:   22028:3d0572ab3b4a
tag:         tip
user:        Pierre-Yves David <pierre-yves.david at ens-lyon.org>
date:        Tue Aug 05 14:58:45 2014 -0700
summary:     merge: add an internal:merge3 tool

-- 
Repository URL: http://selenic.com/repo/hg/


More information about the Mercurial-devel mailing list