Merge pull request #639 from wget/patch-2

ben · web-flow · commit 7ada67328f5c · 2016-08-14T08:21:56.000-07:00
Simplify sentence. Construction not obvious for non natives
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:
 #
 ----
 
-You can modify that message with details about how you resolved the merge if you think it would be helpful to others looking at this merge in the future – why you did what you did, 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`		`-You can modify that message with details about how you resolved the merge if you think it would be helpful to others looking at this merge in the future – why you did what you did, 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.`