Mercurial > hg

diff mercurial/node.py @ 16534:11212babc690 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: check for untracked files more precisely (issue3400) This fixes the regression, but still leaves the long-standing issue that merge doesn't cope with trying to merge files and directories.
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Apr 2012 13:18:09 -0500
parents 25e572394f5c
children 1a5211f2f87f
line wrap: on
line diff