xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index ed416e14e07950d9c7a0d0b85cd9e0307dd55a65..c1cec553060a2fd6a4d27191a866b3bf53ba3335 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -4,6 +4,8 @@ test_description='GIT_EDITOR, core.editor, and stuff'
 
 . ./test-lib.sh
 
+OLD_TERM="$TERM"
+
 for i in GIT_EDITOR core_editor EDITOR VISUAL vi
 do
        cat >e-$i.sh <<-EOF
@@ -35,7 +37,7 @@ test_expect_success 'dumb should error out when falling back on vi' '
        if git commit --amend
        then
                echo "Oops?"
-               exit 1
+               false
        else
                : happy
        fi
@@ -87,4 +89,6 @@ do
        '
 done
 
+TERM="$OLD_TERM"
+
 test_done