tests/test-merge4.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sat, 28 Feb 2009 12:23:23 +0100
changeset 7805 cf6ec23a1bb5
parent 6336 4b0c9c674707
permissions -rw-r--r--
help: better explanation for some of the environment variables In particular, the precedence for usernames is explained in more detail. Thanks to timeless for pointing out the deficiencies here.

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