[FEATURE] Move commands on one line

pixelbrackets · pixelbrackets · commit 158b824b1c74 · 2013-10-25T15:53:53.000+02:00
diff --git a/git_cheat_sheet.md b/git_cheat_sheet.md
@@ -248,6 +248,7 @@
 
 * Manually solve conflicts and mark file as resolved
 
+		git add <resolved-file> && git commit -m 'Manual Merge'
 
 * Use a merge tool to solve conflicts
 

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@`
`248`	`248`
`249`	`249`	`* Manually solve conflicts and mark file as resolved`
`250`	`250`
	`251`	`+ git add <resolved-file> && git commit -m 'Manual Merge'`
`251`	`252`
`252`	`253`	`* Use a merge tool to solve conflicts`
`253`	`254`