Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3.out @ 829:764b0350acb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Shortened hgmerge a little bit.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:16:41 +0100
parents 0902ffece4b4
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -A -mcomment #1 -d 0 0
removing b
b never committed!
nothing changed