tests/test-merge3.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 15 Aug 2006 11:38:07 -0700
changeset 2903 013921c753bd
parent 1747 91c56c427171
permissions -rw-r--r--
merge with other head by default, not tip. fixes issue 339.

removing b
nothing changed