Mercurial > hg
comparison tests/test-confused-revert.out @ 1449:30146be3437c
Add test-confused-revert, fix permissions on test-revert
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 25 Oct 2005 15:54:44 -0700 |
parents | |
children | d436b21b20dc |
comparison
equal
deleted
inserted
replaced
1448:182879d71922 | 1449:30146be3437c |
---|---|
1 %%% should show a removed and b added | |
2 A b | |
3 R a | |
4 reverting... | |
5 %%% should show b unknown and a back to normal | |
6 ? b | |
7 merging a | |
8 %%% should show foo-b | |
9 foo-b | |
10 %%% should show a removed and b added | |
11 A b | |
12 R a | |
13 reverting... | |
14 %%% should show b unknown and a marked modified (merged) | |
15 ? b | |
16 %%% should show foo-b | |
17 foo-b |