Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3828:28134d82db9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add notes about diff/merge asymmetry to export, diff, and log
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Dec 2006 13:04:10 -0600
parents 6398ff7cb705
children 46abbed02b2d
line wrap: on
line diff