From 3bdc9b53ac88f97c02c88ae78aad5847406a6775 Mon Sep 17 00:00:00 2001 From: Richard Cheng Date: Mon, 26 Oct 2009 13:06:55 +0000 Subject: [PATCH] Fixed output of diff by adding a missing space. --- .../0_Advanced_Branching_And_Merging.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/text/26_Advanced_Branching_And_Merging/0_Advanced_Branching_And_Merging.markdown b/text/26_Advanced_Branching_And_Merging/0_Advanced_Branching_And_Merging.markdown index cb87d2bb..977624c1 100644 --- a/text/26_Advanced_Branching_And_Merging/0_Advanced_Branching_And_Merging.markdown +++ b/text/26_Advanced_Branching_And_Merging/0_Advanced_Branching_And_Merging.markdown @@ -54,7 +54,7 @@ index), the diff will look like: +++ b/file.txt @@@ -1,1 -1,1 +1,1 @@@ - Hello world - -Goodbye + -Goodbye ++Goodbye world This shows that our resolved version deleted "Hello world" from the @@ -88,4 +88,4 @@ Each time you resolve the conflicts in a file and update the index: $ git add file.txt the different stages of that file will be "collapsed", after which -git-diff will (by default) no longer show diffs for that file. \ No newline at end of file +git-diff will (by default) no longer show diffs for that file.