diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-12 22:31:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-12 22:31:39 (GMT) |
| commit | e886efdb342cee6722762e654ddc1fdee37315b5 (patch) | |
| tree | e1298d35a6602cddaccb2dca0bb9835e74d30dbe /git-mergetool.sh | |
| parent | bb87344a74119abeb2ca8c7f42f89ccad1ba6e32 (diff) | |
| parent | cb357221a402c55b23bf99ec9f3b361709d45fa7 (diff) | |
| download | git-e886efdb342cee6722762e654ddc1fdee37315b5.zip git-e886efdb342cee6722762e654ddc1fdee37315b5.tar.gz git-e886efdb342cee6722762e654ddc1fdee37315b5.tar.bz2 | |
Merge branch 'jk/colors-fix'
* jk/colors-fix:
t4026: test "normal" color
config: fix parsing of "git config --get-color some.key -1"
docs: describe ANSI 256-color mode
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions