tests/test-merge5.out
author TK Soh <teekaysoh@yahoo.com>
Sat, 27 Aug 2005 12:00:12 -0700
changeset 1088 39b916b1d8e4
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
updated manpage for new options of status

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)