diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:24:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:24:55 -0800 |
| commit | a4ee44448fe98dcd8f1db9e43729ac67fc80e031 (patch) | |
| tree | 34f4cce68fd066d044dcbca866a161fa5c98dc6b /git-gui/lib/merge.tcl | |
| parent | 1f9c1fab6421402a9c893a2fcd35fb4cf6116166 (diff) | |
| parent | ffa952497288d29d94b16675c6789ef83850def3 (diff) | |
Sync with 2.16.2
* tag 'v2.16.2':
Git 2.16.2
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions