comparison tests/test-copy-move-merge.out @ 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 8d9bdcbb2b18
children 17ed9b9a0d03
comparison
equal deleted inserted replaced
5240:438ff951df70 5242:466323968b23