Mercurial > hg

comparison mercurial/simplemerge.py @ 30096:98d3d8108db0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: update doc of manifestmerge() per 18c2184c27dc p1 was renamed to wctx by 18c2184c27dc.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 02 Oct 2016 17:31:32 +0900
parents c3e9269d9602
children 5f7d13d3bd4d
comparison
equal deleted inserted replaced
30095:e8aeeb28e35e 30096:98d3d8108db0