Mercurial > hg > mercurial-crew-with-dirclash

diff .hgignore @ 5221:8860f29447c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: fix ancestor calculation If wctx already has two parents, ancestor calculation is wrong. Normally merge is called before wctx gets the second parent, so we simulate this in imerge by temporarily popping the second parent before calling filemerge. Highly dirty. This patch also handles the ParseError move from cmdutil to dispatch.
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 19:51:59 -0700
parents e6cc4d4f5a81
children
line wrap: on
line diff