diff tests/test-bad-pull @ 5242:466323968b23

Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:21:04 -0300
parents 66249be9aa23
children e3a0c092b4e2
line wrap: on
line diff