| commit | 004fb9c07f8edb7b9a70cc713a435f074863c780 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 00:38:58 +0000 (9 16:38 -0800) | ||
| tree | 01e10fc1e425af0ae64af250f9752852cb65d24e | treesnapshot (tar.gz zip) |
| parent | 765cf751d924435b448ad45ce4148e819e9c5531 | commitdiff |
| parent | ffe6dc081aa23d56e6306d143d99ca508db38c5e | commitdiff |
Merge branch 'ss/mergetool--lib' into next
* 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
| contrib/completion/git-completion.bash | diff1 | diff2 | blobhistory |
| git-mergetool--lib.sh | diff1 | diff2 | blobhistory |