view tests/test-merge2.out @ 3717:9e248cfd8b94

handle files with more than one git binary patch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Nov 2006 22:03:36 -0200
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b