Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-revert.out @ 895:77b52b864249
Merge walk changes with Matt's tip.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sat, 13 Aug 2005 15:26:32 -0800 |
parents | 9c918287d10b 62ec665759f2 |
children | 01215ad04283 |
comparison
equal
deleted
inserted
replaced
890:391de0bcc722 | 895:77b52b864249 |
---|---|
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 |