Merge branch 'mv/merge-noff'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 1a6b52234d8df70e5ddcb28c0ddde582d8310d43..fe6080da576c45cec800376e81915c51f11f7106 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -258,6 +258,7 @@ diff --patch-with-stat -r initial..side
 diff --patch-with-raw -r initial..side
 diff --name-status dir2 dir
 diff --no-index --name-status dir2 dir
+diff master master^ side
 EOF
 
 test_done