Mercurial > hg > mercurial-crew-with-dirclash

diff templates/template-vars.txt @ 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 c77a679e9cfa
children f8d44a2e6928
line wrap: on
line diff