Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3901:733d56b8830f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix strip on windows c: was interpreted as a protocol, prepend file: to the bundle file name
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 15 Dec 2006 23:19:12 +0100
parents c0a12e6441a5
children 1e0b94cfba0e c95060a5391a
line wrap: on
line diff