In message <[EMAIL PROTECTED]> on Thu, 31 Aug 2006 13:42:06 -0400 (EDT), "Michael Milner" <[EMAIL PROTECTED]> said:
milner> I think there's a small bug in the merge3/get_preferred_merge3_command milner> hooks for 0.29. milner> milner> get_preferred_merge3_command lists in it's default_order array milner> "tortoisemerge" however earlier when the mergers array is milner> defined it is listed as "mergers.tortoise". milner> milner> A work around is to use: milner> merger = "tortoise" milner> in the monotonerc file, however it should probably be changed to use milner> "tortoisemerge" everywhere. I fixed it not long ago, but in the other direction, using "tortoise" everywhere relevant. That makes it more consistent with all other methods (except rcsmerge, which is special anyway), who do not have the word "merge" in their name. Cheers, Richard ----- Please consider sponsoring my work on free software. See http://www.free.lp.se/sponsoring.html for details. -- Richard Levitte [EMAIL PROTECTED] http://richard.levitte.org/ "When I became a man I put away childish things, including the fear of childishness and the desire to be very grown up." -- C.S. Lewis _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
