Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 21:18:16 -0600] rev 10486
mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools