Mercurial > hg-stable

comparison hgmerge @ 1448:182879d71922

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow reverting a deleted file with two parents As elsewhere, we choose the first parent by default
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Oct 2005 15:52:27 -0700
parents 696851b1bba9
children 64a1169c927d
comparison
equal deleted inserted replaced
1447:508a3f559553 1448:182879d71922