equal
deleted
inserted
replaced
90 changeset: 0:80b572aaf098 |
90 changeset: 0:80b572aaf098 |
91 user: test |
91 user: test |
92 date: Mon Jan 12 13:46:40 1970 +0000 |
92 date: Mon Jan 12 13:46:40 1970 +0000 |
93 summary: commit-foo-subdir |
93 summary: commit-foo-subdir |
94 |
94 |
|
95 adding a |
|
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 created new head |
|
98 merging a |
|
99 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
100 (branch merge, don't forget to commit) |
|
101 % should fail because we are specifying a file name |
|
102 abort: cannot partially commit a merge (do not specify files or patterns) |
|
103 % should fail because we are specifying a pattern |
|
104 abort: cannot partially commit a merge (do not specify files or patterns) |
|
105 % should succeed |