tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 18 Oct 2005 17:56:50 -0700
changeset 1398 3f76ac60130d
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
make update quieter when nothing is wrong sometimes when i am going around in my history, i get long lists of errors from the update command. this patch will fix that. i tried to make the code style the same like the rest of the code.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)