t: branch: fix typo

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1bcf11b3971e7c09128f043b560c66af41332d79..fe723e472275dc8989338be9a1bc592a4dd18425 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1841,7 +1841,7 @@ Once the index is updated with the results of the conflict
 resolution, instead of creating a new commit, just run
 
 -------------------------------------------------
-$ git am --resolved
+$ git am --continue
 -------------------------------------------------
 
 and Git will create the commit for you and continue applying the
@@ -4675,5 +4675,5 @@ Write a chapter on using plumbing and writing scripts.
 Alternates, clone -reference, etc.
 
 More on recovery from repository corruption.  See:
-       http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
-       http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2
+       http://marc.info/?l=git&m=117263864820799&w=2
+       http://marc.info/?l=git&m=117147855503798&w=2