diff tests/test-excessive-merge.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 8feb33c2d153
line wrap: on
line diff