@ -217,14 +217,14 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
@@ -217,14 +217,14 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
'
pwd=`pwd`
cat > .git/FAKE_EDITOR << EOF
#! /bin/sh
cat >.git/FAKE_EDITOR <<EOF
#! $SHELL_PATH
# kill -TERM command added below.
EOF
test_expect_success 'a SIGTERM should break locks' '