tests/test-merge2.out
author Martin Geisler <mg@lazybytes.net>
Sun, 29 Aug 2010 22:46:00 +0200
branchstable
changeset 12069 7c3c44413bc1
parent 6336 4b0c9c674707
permissions -rw-r--r--
churn: do not crash on malformed lines in alias file

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head