equal
deleted
inserted
replaced
82 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
82 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
83 % update with no arguments: tipmost revision of the current branch |
83 % update with no arguments: tipmost revision of the current branch |
84 bf1bc2f45e83 |
84 bf1bc2f45e83 |
85 4909a3732169 (foo) tip |
85 4909a3732169 (foo) tip |
86 abort: branch foobar not found |
86 abort: branch foobar not found |
|
87 % fastforward merge |
|
88 adding ff |
|
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
91 (branch merge, don't forget to commit) |
|
92 foo |
|
93 changeset: 6:9cc105113eeb |
|
94 branch: foo |
|
95 tag: tip |
|
96 user: test |
|
97 date: Mon Jan 12 13:46:40 1970 +0000 |
|
98 summary: Merge ff into foo |
|
99 |
|
100 a |
|
101 ff |