Merge pull request progit#170 from zigarn/fix

Fix 'dummy ours merge strategy' display
OlingCat · Nov 13, 2014 · 1d874a3 · 1d874a3
2 parents 9ab7615 + 87b982d
commit 1d874a3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/book/08-customizing-git/sections/attributes.asc b/book/08-customizing-git/sections/attributes.asc
@@ -314,12 +314,12 @@ You can set up an attribute like this:
 database.xml merge=ours
 ----
 
-[source,console]
-----
 And then define a dummy `ours` merge strategy with:
-----
 
+[source,console]
+----
 $ git config --global merge.ours.driver true
+----
 
 If you merge in the other branch, instead of having merge conflicts with the `database.xml` file, you see something like this: