summaryrefslogtreecommitdiff
path: root/mergetools
Commit message (Expand)AuthorAgeFilesLines
* mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-151-1/+6
* mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-191-1/+24
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-1915-0/+306