diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:22 +0900 |
| commit | d658196f3c4b2478ebdff638e2c3e4fb2f9cbba2 (patch) | |
| tree | 253a7b9f1778db6ec10b662d1c12101ea4cdba87 /git-gui/lib/commit.tcl | |
| parent | 6b0f1d9c475038a54343c007193f1c81ae82b959 (diff) | |
| parent | 7db118303aa04930bea66e855e8659e042f3fa5d (diff) | |
Merge branch 'en/unpack-trees-split-index-fix'
The split-index feature had a long-standing and dormant bug in
certain use of the in-core merge machinery, which has been fixed.
* en/unpack-trees-split-index-fix:
unpack_trees: fix breakage when o->src_index != o->dst_index
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions