Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-default.out @ 3044:fcadf7a32425
Merge with mpm
| author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Sun, 03 Sep 2006 06:06:02 -0400 |
| parents | 013921c753bd |
| children | 9cd6578750b9 |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-merge-default.out @@ -0,0 +1,17 @@ +adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +% should fail because not at a head +abort: repo has 3 heads - please merge with an explicit rev +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +% should fail because > 2 heads +abort: repo has 3 heads - please merge with an explicit rev +% should succeed +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +% should succeed - 2 heads +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +% should fail because 1 head +abort: there is nothing to merge - use "hg update" instead