chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove the resolved command
[stgit]
/
Documentation
/
tutorial.txt
diff --git
a/Documentation/tutorial.txt
b/Documentation/tutorial.txt
index 8e0adbfbb945454e2d8aaa962f0a390db943b371..4aa7629b4954039166bfaf21dc9907ca7f4da309 100644
(file)
--- 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 resolve
d TODO
+ $
git ad
d TODO
$ stg status
M TODO