diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 05:57:07 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-23 12:50:06 -0700 |
| commit | 3b026417eaa1f32f53b85d1b131194ae1cbbf068 (patch) | |
| tree | 88021090ad5695a6497243778afdc12d437b9007 /t/t6037-merge-ours-theirs.sh | |
| parent | format-patch: teach --interdiff to respect -v/--reroll-count (diff) | |
| download | tgif-3b026417eaa1f32f53b85d1b131194ae1cbbf068.tar.xz | |
interdiff: teach show_interdiff() to indent interdiff
A future change will allow "git format-patch --interdiff=<prev> -1" to
insert an interdiff into the commentary section of the lone patch of a
1-patch series. However, to prevent the inserted interdiff from
confusing git-am, as well as human readers, it needs to be indented.
Therefore, teach show_interdiff() how to indent.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions