X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=4ce799b520b501b1ea6dddd5643bf3aec2aca344;hb=9202434cbdfb123f41fc677bbf36ff21f6094fc8;hp=0cac563d40f17361569923aebb51e454fd24f92e;hpb=423325a2d24638ddcc82ce47be5e40be550f4507;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0cac563d..4ce799b5 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -37,6 +37,11 @@ include::merge-options.txt[]
 include::merge-strategies.txt[]
 
 
+If you tried a merge which resulted in a complex conflicts and
+would want to start over, you can recover with
+gitlink:git-reset[1].
+
+
 HOW MERGE WORKS
 ---------------