Mercurial > hg

diff hgext/imerge.py @ 5708:f6bf89722e29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add flag merging intelligence - properly handle all 27 combinations of flags - prompt on conflicts
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 22:47:44 -0600
parents 3786ef8877d5
children 7855b88ba838
line wrap: on
line diff