| commit | c1777a297043a06d6c18d383d17447f5eefcdcbe | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Oct 2014 17:08:03 +0000 (29 10:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Oct 2014 17:08:04 +0000 (29 10:08 -0700) | ||
| tree | 425021beccd0550006182fc43b52e56846551bce | treesnapshot (tar.gz zip) |
| parent | d70e331c0e8eaeb0bd75ae3020c3be71de075ff7 | commitdiff |
| parent | f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 | commitdiff |
Merge branch 'oc/mergetools-beyondcompare'
* oc/mergetools-beyondcompare:
mergetool: rename bc3 to bc
* oc/mergetools-beyondcompare:
mergetool: rename bc3 to bc
| contrib/completion/git-completion.bash | diff1 | diff2 | blobhistory |