tests/test-merge2.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 14 May 2006 21:07:34 -0700
changeset 2283 e506c14382fd
parent 2175 b2ae81a7df29
permissions -rw-r--r--
deprecate 'update -m'. use 'merge' instead.

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b