diff hgmerge @ 5227: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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff