Mercurial > hg
view tests/test-conflict @ 3721:98f2507c5551
only print a warning when no username is specified
- revert most of 8b55c0ba
- display the username during interactive commit
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 28 Nov 2006 21:16:05 +0100 |
parents | e506c14382fd |
children | 46280c004f22 |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" HGMERGE=merge; export HGMERGE hg merge 1 hg id egrep -v ">>>|<<<" a hg status