| 2013-02-07 | Sync with 1.8.1.3 | blob | diff | raw | |
| 2013-02-07 | Merge branch 'ss/mergetools-tortoise' | blob | diff | raw | |
| 2013-02-07 | Merge branch 'jk/mergetool' | blob | diff | raw | |
| 2013-01-29 | mergetools: simplify how we handle "vim" and "defaults" | blob | diff | raw | |