Update basic-branching-and-merging.asc

wget · web-flow · commit 126980a88cb3 · 2016-08-08T18:04:03.000+02:00
diff --git a/book/03-git-branching/sections/basic-branching-and-merging.asc b/book/03-git-branching/sections/basic-branching-and-merging.asc
@@ -318,4 +318,4 @@ Conflicts:
 #
 ----
 
-If you think it would be helpful to others looking at this merge in the future, you can modify this commit message with details about how you resolved the merge and explain why you did the changes you made, if it's not obvious.
+If you think it would be helpful to others looking at this merge in the future, you can modify this commit message with details about how you resolved the merge and explain why you did the changes you made if these are not obvious.

Original file line number	Diff line number	Diff line change
`@@ -318,4 +318,4 @@ Conflicts:`
`318`	`318`	`#`
`319`	`319`	`----`
`320`	`320`
`321`		`-If you think it would be helpful to others looking at this merge in the future, you can modify this commit message with details about how you resolved the merge and explain why you did the changes you made, if it's not obvious.`
	`321`	`+If you think it would be helpful to others looking at this merge in the future, you can modify this commit message with details about how you resolved the merge and explain why you did the changes you made if these are not obvious.`