![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 Mar 2011 06:24:27 +0000 (23:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 Mar 2011 06:24:27 +0000 (23:24 -0700) | ||
| commit | 9d59e6607a597a0a934566bfa547b45c7b57822c | |
| tree | c3ff191357256ec88cfb7f770e5b10554c16e34d | tree | snapshot |
| parent | f4784b3eab2e12e7a8fda7431572753f3a970c63 | commit | diff |
| parent | ffe6dc081aa23d56e6306d143d99ca508db38c5e | commit | diff |
Merge branch 'ss/mergetool--lib'
* ss/mergetool--lib:
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Sort tools alphabetically for easier lookup
* ss/mergetool--lib:
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Sort tools alphabetically for easier lookup