Merge pull request #170 from zigarn/fix

Fix 'dummy ours merge strategy' display

Author: ben

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: