diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-08-06 01:08:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-12 00:21:45 +0300 |
| commit | 298889d3e2053cf903b01fbac902cbfb210109ea (patch) | |
| tree | a30dd32f11d6f678bfbe09757126371ccc2e425b /t/t4013-diff-various.sh | |
| parent | 405a2fdf998d42469634efeff8461f221bb9398b (diff) | |
t/t4013: add test for --diff-merges=off
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 40e222c945..7f7f1058cb 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -298,6 +298,8 @@ log --root -c --patch-with-stat --summary master # improved by Timo's patch log --root --cc --patch-with-stat --summary master log --no-diff-merges -p --first-parent master +log --diff-merges=off -p --first-parent master +log --first-parent --diff-merges=off -p master log -p --first-parent master log -m -p --first-parent master log -m -p master |