diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
| commit | cadae717d557840d3566b7c0fc2003046e08c88f (patch) | |
| tree | f6c95ee9d4216724dab20c6b17992965d423abe1 /git-gui/lib/commit.tcl | |
| parent | 09e72204f87db7226af97b12beff6774946af71b (diff) | |
| parent | 30bb8088afd4502acd2e166ddf7e4b071e53b86d (diff) | |
Merge branch 'sh/mergetools-vimdiff1'
Mergetools update.
* sh/mergetools-vimdiff1:
mergetools/vimdiff: add vimdiff1 merge tool variant
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions