Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-confused-revert @ 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 6c6c0e5595a2
children 890e285c52a1
comparison
equal deleted inserted replaced
2282:2efa636eb411 2283:e506c14382fd
26 26
27 hg co -C 0 27 hg co -C 0
28 echo foo-b > a 28 echo foo-b > a
29 hg commit -m "2b" -d "1000000 0" 29 hg commit -m "2b" -d "1000000 0"
30 30
31 HGMERGE=true hg update -m 1 31 HGMERGE=true hg merge 1
32 32
33 echo "%%% should show foo-b" 33 echo "%%% should show foo-b"
34 cat a 34 cat a
35 35
36 echo bar > b 36 echo bar > b