equal
deleted
inserted
replaced
49 $ hg qdiff |
49 $ hg qdiff |
50 diff -r 07f494440405 a |
50 diff -r 07f494440405 a |
51 --- a/a |
51 --- a/a |
52 +++ b/a |
52 +++ b/a |
53 @@ -1,1 +1,3 @@ |
53 @@ -1,1 +1,3 @@ |
54 a |
54 +a |
55 +a |
55 a |
56 +b |
56 +b |
57 |
57 |
58 Fold with local changes: |
58 Fold with local changes: |
59 |
59 |
60 $ echo d >> a |
60 $ echo d >> a |
65 $ hg diff -c . |
65 $ hg diff -c . |
66 diff -r 07f494440405 -r ???????????? a (glob) |
66 diff -r 07f494440405 -r ???????????? a (glob) |
67 --- a/a |
67 --- a/a |
68 +++ b/a |
68 +++ b/a |
69 @@ -1,1 +1,3 @@ |
69 @@ -1,1 +1,3 @@ |
70 a |
70 +a |
71 +a |
71 a |
72 +b |
72 +b |
73 |
73 |
74 $ hg revert -a --no-backup |
74 $ hg revert -a --no-backup |
75 reverting a |
75 reverting a |
76 |
76 |