userdiff: add built-in pattern for CSS

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index dc9f142f537e53de34156a9c7fddf3be49a0e219..85248a14b61d68b61932d595eb0fa8fcaa8506b1 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -753,4 +753,14 @@ test_expect_success 'merge detects mod-256 conflicts (resolve)' '
        test_must_fail git merge -s resolve master
 '
 
+test_expect_success 'merge nothing into void' '
+       git init void &&
+       (
+               cd void &&
+               git remote add up .. &&
+               git fetch up &&
+               test_must_fail git merge FETCH_HEAD
+       )
+'
+
 test_done