Mercurial > hg > mercurial-crew-with-dirclash

diff hgmerge @ 5223:3786ef8877d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: add automerge flag to attempt to batch merge all conflicts
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 22:45:41 -0700
parents f53d97d651f4
children
line wrap: on
line diff