git-add: no need for -f when resolving a conflict in already tracked path

diff --git a/t/t4100/t-apply-5.patch b/t/t4100/t-apply-5.patch
index de11623d1babf50952e45b46015ae45bb07ac2bf..5f6ddc105950eac20bcacb7987fabff015320ee3 100644 (file)
--- a/t/t4100/t-apply-5.patch
+++ b/t/t4100/t-apply-5.patch
@@ -200,7 +200,7 @@ diff a/Documentation/git.txt b/Documentation/git.txt
 diff 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 \