Merge branch 'dm/add-i-edit-abort'

diff --git a/t/t4100/t-apply-1.patch b/t/t4100/t-apply-1.patch
index de587517f434d3801d5e0aad94d4e084cbdd5b06..90ab54f0f586c87ace077be87fba396c8f2781a0 100644 (file)
--- a/t/t4100/t-apply-1.patch
+++ b/t/t4100/t-apply-1.patch
@@ -90,7 +90,7 @@ diff --git a/Documentation/git.txt b/Documentation/git.txt
 diff --git a/Makefile b/Makefile
 --- a/Makefile
 +++ b/Makefile
-@@ -30,7 +30,7 @@ PROG=   git-update-cache git-diff-files 
+@@ -30,7 +30,7 @@ PROG=   git-update-index git-diff-files
        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \