tests/test-merge2.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 24 Mar 2008 15:36:56 -0700
changeset 6385 0d4e068e9e52
parent 6336 4b0c9c674707
permissions -rw-r--r--
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head