view tests/test-merge2.out @ 7175:5d8626b2c1db

parsers.c: do not try to untrack after a failure
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 19 Oct 2008 20:17:06 +0200
parents 4b0c9c674707
children
line wrap: on
line source

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