Code

Merge branch 'jc/utf8'
[git.git] / git-revert.sh
index 6eab3c72df0db0994a352836018a7fc35ba1eae3..50cc47b0634201e7acaaa0a0642be779aaf7c2da 100755 (executable)
@@ -155,7 +155,7 @@ Conflicts:
                uniq
            } >>"$GIT_DIR/MERGE_MSG"
            echo >&2 "Automatic $me failed.  After resolving the conflicts,"
-           echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+           echo >&2 "mark the corrected paths with 'git-add <paths>'"
            echo >&2 "and commit the result."
            case "$me" in
            cherry-pick)