equal
deleted
inserted
replaced
93 adding ff |
93 adding ff |
94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
96 (branch merge, don't forget to commit) |
96 (branch merge, don't forget to commit) |
97 foo |
97 foo |
98 changeset: 6:9cc105113eeb |
98 changeset: 6:f0c74f92a385 |
99 branch: foo |
99 branch: foo |
100 tag: tip |
100 tag: tip |
|
101 parent: 4:4909a3732169 |
|
102 parent: 5:c420d2121b71 |
101 user: test |
103 user: test |
102 date: Mon Jan 12 13:46:40 1970 +0000 |
104 date: Mon Jan 12 13:46:40 1970 +0000 |
103 summary: Merge ff into foo |
105 summary: Merge ff into foo |
104 |
106 |
105 a |
107 a |