diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:40 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:31 -0800 |
| commit | 3291eea3104e1a1aa64181671da3f9551ec3d59f (patch) | |
| tree | e0b5e5a4361199ff54689f33ec07a5a60fdd0e6d /git-gui | |
| parent | diff-merges: new function diff_merges_set_dense_combined_if_unset() (diff) | |
| download | tgif-3291eea3104e1a1aa64181671da3f9551ec3d59f.tar.xz | |
diff-merges: introduce revs->first_parent_merges flag
This new field allows us to separate format of diff for merges from
'first_parent_only' flag which primary purpose is limiting history
traversal.
This change further localizes diff format selection logic into the
diff-merges.c file.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions