diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-09-20 01:05:10 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-20 01:05:10 +0400 |
commit | 04cd47f553796263451c946061e175d847f388c3 (patch) | |
tree | 24bad2f1f907961c2e2af06f395b8b0fb3258fc7 /mergetools/gvimdiff2 | |
parent | 723361a572e8c9fe93f00b17a1f4ed02585923b2 (diff) | |
parent | a789ca70e7a5b02973b116d21674acd795238f99 (diff) |
Merge branch 'jk/command-line-config-empty-string' into maint
* jk/command-line-config-empty-string:
config: teach "git -c" to recognize an empty string
Conflicts:
config.c
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions