diff --git a/git-revert.sh b/git-revert.sh
index 2c5870684c9a0993116a86a511a0e9998a27b621..c19d3a6916ce9c5dccff09f6edfd8b5478b2e834 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
result=$(git-write-tree 2>/dev/null) || {
echo >&2 "Simple $me fails; trying Automatic $me."
git-merge-index -o git-merge-one-file -a || {
- echo >&2 "Automatic $me failed. After fixing it up,"
- echo >&2 "you can use \"git commit -F .msg\""
+ echo >&2 "Automatic $me failed. After resolving the conflicts,"
+ echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+ echo >&2 "and commit with 'git commit -F .msg'"
case "$me" in
cherry-pick)
echo >&2 "You may choose to use the following when making"