Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-incoming-outgoing.out @ 2548:0229ff95faec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 9cceb439048b
children b2d9e553cdc8 671158f060cc
line wrap: on
line diff