tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Mon, 24 Jul 2006 09:22:47 -0700
changeset 2648 df5e58c84b01
parent 2175 b2ae81a7df29
permissions -rw-r--r--
util.getuser: better comments

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)