X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/afddd62b52567fc1834e658b968f5a62334ea63c..9ab06b9858bbb0196867506724a8d74c8f39e113:/Documentation/tutorial.txt diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 8e0adbf..4aa7629 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -313,7 +313,7 @@ markers. Now that we've resolved the conflict, we just need to tell StGit about it: - $ stg resolved TODO + $ git add TODO $ stg status M TODO