| 2011-08-25 | Merge branch 'jc/merge-reword' | tree | diff | |
| 2011-08-25 | Merge branch 'mg/branch-set-upstream-previous' | tree | diff | |
| 2011-08-25 | Merge branch 'da/difftool-mergtool-refactor' | tree | diff | |
| 2011-08-19 | mergetools/meld: Use '--output' when available | tree | diff | |
| 2011-08-19 | mergetool--lib: Refactor tools into separate files | tree | diff | |