Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-conflict @ 2283:e506c14382fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents 7544700fd931
children 46280c004f22
comparison
equal deleted inserted replaced
2282:2efa636eb411 2283:e506c14382fd
8 hg commit -m branch1 -d "1000000 0" 8 hg commit -m branch1 -d "1000000 0"
9 hg co 0 9 hg co 0
10 echo "something else" > a 10 echo "something else" > a
11 hg commit -m branch2 -d "1000000 0" 11 hg commit -m branch2 -d "1000000 0"
12 HGMERGE=merge; export HGMERGE 12 HGMERGE=merge; export HGMERGE
13 hg up -m 1 13 hg merge 1
14 hg id 14 hg id
15 egrep -v ">>>|<<<" a 15 egrep -v ">>>|<<<" a
16 hg status 16 hg status