tests/test-merge5.out
author Muli Ben-Yehuda <mulix@mulix.org>
Thu, 29 Dec 2005 14:59:19 -0600
changeset 1607 d72d27ee72b9
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
add '_' to several strings

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)