Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/mpatch.c @ 174:23057dc57d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg merge: abort if there are outstanding changes in the working directory We currently don't support merging from the tip into the working directory, so merge with outstanding local changes is asking for trouble.
author mpm@selenic.com
date Thu, 26 May 2005 22:54:48 -0800
parents d6afb6dbf9f2
children 97d83e7fbf2f
line wrap: on
line diff