On Sat, Nov 14, 2009 at 01:33:13PM -0800, Tarmigan Casebolt <tarmigan+git@xxxxxxxxx> wrote: > it for others to make a proper fix. Looks like Miklos touched that line > last, so perhaps he knows of a better fix. I just added struct merge_options, the real change is commit a97e407 (Keep rename/rename conflicts of intermediate merges while doing recursive merge, 2007-03-31), adding Alex to Cc.
Attachment:
pgprTfeA1XjsO.pgp
Description: PGP signature