view tests/test-simplemerge-cmd.out @ 6385:0d4e068e9e52

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.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 24 Mar 2008 15:36:56 -0700
parents ea7b982b6c08
children e1f4343db740
line wrap: on
line source

(binary:application/octet-stream)