[Monotone-devel] Small bug in merge3 hook script

[Michael Milner]

Hi,

I think there's a small bug in the merge3/get_preferred_merge3_command
hooks for 0.29.

get_preferred_merge3_command lists in it's default_order array
"tortoisemerge" however earlier when the mergers array is defined it is
listed as "mergers.tortoise".

A work around is to use:
merger = "tortoise"
in the monotonerc file, however it should probably be changed to use
"tortoisemerge" everywhere.

Thanks, great project!

Mike