equal
deleted
inserted
replaced
142 summary: b1 |
142 summary: b1 |
143 |
143 |
144 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
144 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
146 (branch merge, don't forget to commit) |
146 (branch merge, don't forget to commit) |
|
147 % log -r . with two parents |
|
148 warning: working directory has two parents, tag '.' uses the first |
|
149 changeset: 3:e62f78d544b4 |
|
150 parent: 1:3d5bf5654eda |
|
151 user: test |
|
152 date: Thu Jan 01 00:00:01 1970 +0000 |
|
153 summary: b1 |
|
154 |
|
155 % log -r . with one parent |
|
156 changeset: 5:302e9dd6890d |
|
157 tag: tip |
|
158 parent: 3:e62f78d544b4 |
|
159 parent: 4:ddb82e70d1a1 |
|
160 user: test |
|
161 date: Thu Jan 01 00:00:01 1970 +0000 |
|
162 summary: m12 |
|
163 |
147 % log --follow-first |
164 % log --follow-first |
148 changeset: 6:2404bbcab562 |
165 changeset: 6:2404bbcab562 |
149 tag: tip |
166 tag: tip |
150 user: test |
167 user: test |
151 date: Thu Jan 01 00:00:01 1970 +0000 |
168 date: Thu Jan 01 00:00:01 1970 +0000 |