| commit | a8fac1896da11c30a0074b7952af98805a5d456f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Mar 2011 23:31:09 +0000 (17 16:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Mar 2011 23:31:09 +0000 (17 16:31 -0700) | ||
| tree | 6f940e8c6b1bc06d3a15a6152085e90234c770f6 | treesnapshot (tar.gz zip) |
| parent | e0acf52488b2f8f28df0087c8ae24a926305cb22 | commitdiff |
| parent | f3768a6714e667205d68475df37a889abb59d2d5 | commitdiff |
Merge branch 'ss/git-gui-mergetool' into next
* ss/git-gui-mergetool:
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Sort tools alphabetically for easier lookup
* ss/git-gui-mergetool:
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Sort tools alphabetically for easier lookup
| git-gui/lib/mergetool.tcl | diff1 | diff2 | blobhistory |