view tests/test-merge2.out @ 8225:46293a0c7e9f

updated license to be explicit about GPL version 2
author Martin Geisler <mg@lazybytes.net>
date Sun, 26 Apr 2009 01:08:54 +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