Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert.out @ 894:62ec665759f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 13 Aug 2005 15:23:06 -0800
parents 9c918287d10b 6d6095823b82
children 77b52b864249
comparison
equal deleted inserted replaced
893:36c991554ebb 894:62ec665759f2
24 3aa14bbc23d9 tip 24 3aa14bbc23d9 tip
25 + hg update -C 0 25 + hg update -C 0
26 + hg update 26 + hg update
27 merging file1 27 merging file1
28 + hg diff 28 + hg diff
29 FIXME: This is a known bug:
30 + hg status 29 + hg status
31 + hg id 30 + hg id
32 3aa14bbc23d9 tip 31 3aa14bbc23d9 tip
33 + hg revert 32 + hg revert
34 + hg diff 33 + hg diff