equal
deleted
inserted
replaced
148 |
148 |
149 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
149 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 (branch merge, don't forget to commit) |
151 (branch merge, don't forget to commit) |
152 % log -r . with two parents |
152 % log -r . with two parents |
153 warning: working directory has two parents, tag '.' uses the first |
|
154 changeset: 3:e62f78d544b4 |
153 changeset: 3:e62f78d544b4 |
155 parent: 1:3d5bf5654eda |
154 parent: 1:3d5bf5654eda |
156 user: test |
155 user: test |
157 date: Thu Jan 01 00:00:01 1970 +0000 |
156 date: Thu Jan 01 00:00:01 1970 +0000 |
158 summary: b1 |
157 summary: b1 |