Merge pull request #190 from justinclift/iss53_filename_fix

ben · ben · commit b1b517284869 · 2014-11-23T14:28:00.000-08:00
Adjusted filename in git merge output
diff --git a/book/03-git-branching/sections/basic-branching-and-merging.asc b/book/03-git-branching/sections/basic-branching-and-merging.asc
@@ -155,7 +155,7 @@ $ git checkout master
 Switched to branch 'master'
 $ git merge iss53
 Merge made by the 'recursive' strategy.
-README |    1 +
+index.html |    1 +
 1 file changed, 1 insertion(+)
 ----
 
