Merge branch 'nd/grep-assume-unchanged' into maint

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 29156f6c3cabd4a015fdf77e04bff3c448e3a66e..2049f3d97b67adc8fa93ca462875db6e522e1923 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -130,7 +130,7 @@ Undo a merge or pull::
 $ git pull                         <1>
 Auto-merging nitfol
 CONFLICT (content): Merge conflict in nitfol
-Automatic merge failed/prevented; fix up by hand
+Automatic merge failed; fix conflicts and then commit the result.
 $ git reset --hard                 <2>
 $ git pull . topic/branch          <3>
 Updating from 41223... to 13134...