builtin/apply: make find_header() return -128 instead of die()ing

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index bfa2c2190d0368eba533a8411df739eee77fa1be..397ccb690908dad2d45bab3d249f9c62f2dc91d1 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -154,17 +154,20 @@ test_expect_success 'git show-branch' '
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
 FASTFORWARD (no commit created; -m option ignored)
- example |    1 +
- hello   |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ example | 1 +
+ hello   | 1 +
+ 2 files changed, 2 insertions(+)
 EOF
 
 test_expect_success 'git resolve' '
        git checkout mybranch &&
        git merge -m "Merge upstream changes." master |
                sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
-               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
-       test_cmp resolve.expect resolve.output
+               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
+'
+
+test_expect_success 'git resolve output' '
+       test_i18ncmp resolve.expect resolve.output
 '
 
 cat > show-branch2.expect << EOF