Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.out @ 836:1fe3b14c7044

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Thu, 04 Aug 2005 13:27:41 -0800
parents 8f5637f0a0c0 ad8ff3534fde
children 9c918287d10b
comparison
equal deleted inserted replaced
827:a61728b58dc0 836:1fe3b14c7044
42 M file1 42 M file1
43 + hg id 43 + hg id
44 3aa14bbc23d9+ tip 44 3aa14bbc23d9+ tip
45 + hg revert 45 + hg revert
46 + hg diff 46 + hg diff
47 FIXME: This is a known bug:
47 + hg status 48 + hg status
48 + hg id 49 + hg id
49 3aa14bbc23d9 tip 50 3aa14bbc23d9 tip
50 + hg revert -r tip 51 + hg revert -r tip
51 + hg diff 52 + hg diff