Mercurial > hg

diff mercurial/bundlerepo.py @ 12314:f2daa6ab514a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.
author Brodie Rao <brodie@bitheap.org>
date Sun, 12 Sep 2010 18:05:53 -0500
parents bcc7139521b7
children 40935b59518b
line wrap: on
line diff