diff tests/test-manifest-merging.out @ 3716:ab5600428b08

handle files with both git binary patches and copy/rename ops
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Nov 2006 22:03:31 -0200
parents be8efb6e1cc6
children 0750f11152fe
line wrap: on
line diff