diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 10:08:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 10:08:04 -0700 |
commit | c1777a297043a06d6c18d383d17447f5eefcdcbe (patch) | |
tree | 425021beccd0550006182fc43b52e56846551bce /Makefile | |
parent | d70e331c0e8eaeb0bd75ae3020c3be71de075ff7 (diff) | |
parent | f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (diff) | |
download | git-c1777a297043a06d6c18d383d17447f5eefcdcbe.tar.gz |
Merge branch 'oc/mergetools-beyondcompare'
* oc/mergetools-beyondcompare:
mergetool: rename bc3 to bc
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions