On Thu, May 31, 2012 at 05:22:41PM +0200, Stefan Sperling wrote: > By code inspection I would guess that 1.7 has the same problem, however. > Can you confirm that? If so, please file an issue. I believe there might > be a bug where the merge compares a version of the file with keywords > expanded to a version of a file with keywords contracted. I don't have > time right now to dig deeper so it would be great if you could help by > confirming that the same problem exists in 1.7. Cheers!
I've moved this conversation to dev@ (same subject line) to get more developers involved in the discussion. Please follow up there. Thanks.
