Merge branch 'maint'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 68cb651645fd5b867d08ccd93e5db8755411eb10..dae635851666a7f5ccf685b89d64f31d5dbdd2fd 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -238,6 +238,9 @@ show initial
 show --root initial
 show side
 show master
+show -c master
+show -m master
+show --first-parent master
 show --stat side
 show --stat --summary side
 show --patch-with-stat side