git log: don't do merge diffs by default

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 207dd3de6484518018b4eb7efe26dc449a9f71cd..ab4dd5c4ce14c496e1239a0013952c4c422a6a50 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -247,5 +247,13 @@ EOF
 
 test_expect_success 'hierarchical section value' 'cmp .git/config expect'
 
+cat > .git/config << EOF
+[novalue]
+       variable
+EOF
+
+test_expect_success 'get variable with no value' \
+       'git-repo-config --get novalue.variable ^$'
+
 test_done