tests/test-merge4.out
author Marti Raudsepp <marti@juffo.org>
Sat, 04 Apr 2009 18:04:38 +0200
changeset 7968 43b70a964e0d
parent 6336 4b0c9c674707
permissions -rw-r--r--
convert: handle comments starting with '#' in authormap files

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)