X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=9c08efa53abc2797a7b7ca0e589d83b9a4387987;hb=e18ee576b1420e7b2cfc5c686872fa3b439ac45f;hp=e53ff4b4e7464079ac6e19f2bceafcb44044fb39;hpb=1e8b0d486e9b244eb1692886ffb50ef728696c52;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e53ff4b4e..9c08efa53 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -136,7 +136,7 @@ After seeing a conflict, you can do two things:
 
  * Resolve the conflicts.  `git-diff` would report only the
    conflicting paths because of the above 2. and 3..  Edit the
-   working tree files into a desirable shape, `git-update-index`
+   working tree files into a desirable shape, `git-add` or `git-rm`
    them, to make the index file contain what the merge result
    should be, and run `git-commit` to commit the result.