Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/ancient-meld-support' into maint | Junio C Hamano | 2012-02-27 | 1 | -1/+1 |
|\ | |||||
| * | mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-support | Jonathan Nieder | 2012-02-10 | 1 | -1/+1 |
* | | mergetools: use the correct tool for Beyond Compare 3 on Windows | Pat Thoyts | 2011-10-15 | 1 | -1/+6 |
|/ | |||||
* | mergetools/meld: Use '--output' when available | David Aguilar | 2011-08-19 | 1 | -1/+24 |
* | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 15 | -0/+306 |