view tests/test-revert-flags.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.

% reverting to rev 0
reverting foo
M foo
diff --git a/foo b/foo
old mode 100755
new mode 100644