equal
deleted
inserted
replaced
91 |
91 |
92 $ hg amend -d "Thu Jan 01 00:00:00 1970 UTC" |
92 $ hg amend -d "Thu Jan 01 00:00:00 1970 UTC" |
93 nothing changed |
93 nothing changed |
94 [1] |
94 [1] |
95 |
95 |
|
96 #if obsstore-on |
|
97 $ hg init repo-merge-state |
|
98 $ cd repo-merge-state |
|
99 $ echo a > f |
|
100 $ hg ci -Aqm a |
|
101 $ echo b > f |
|
102 $ hg ci -Aqm b |
|
103 $ echo c > f |
|
104 $ hg co -m '.^' |
|
105 merging f |
|
106 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
107 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
108 use 'hg resolve' to retry unresolved file merges |
|
109 [1] |
|
110 $ echo d > f |
|
111 $ hg resolve -m f |
|
112 (no more unresolved files) |
|
113 $ hg ci --amend --config experimental.evolution.allowunstable=True |
|
114 1 new orphan changesets |
|
115 $ hg resolve -l |
|
116 R f |
|
117 $ cd .. |
|
118 #endif |
|
119 |
96 Matcher and metadata options |
120 Matcher and metadata options |
97 |
121 |
98 $ echo 3 > C |
122 $ echo 3 > C |
99 $ echo 4 > D |
123 $ echo 4 > D |
100 $ hg add C D |
124 $ hg add C D |