tests/test-merge2.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 15 May 2009 10:46:39 +0200
changeset 8427 cebdfdcc3e42
parent 6336 4b0c9c674707
permissions -rw-r--r--
git: use newer template syntax everywhere

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