diff ChangeLog @ 18689:c4d1a940aa83

Having the option of test compiling during merge conflict resolving would be a great feature...
author Andreas Monitzer <pidgin@monitzer.com>
date Thu, 12 Jul 2007 02:56:00 +0000
parents 24ecab0d40b3
children 70c758256110
line wrap: on
line diff