From 87b982d0c258f4d219835fa89a5ed857488eee59 Mon Sep 17 00:00:00 2001 From: Alexandre Garnier Date: Thu, 13 Nov 2014 11:12:45 +0100 Subject: [PATCH] Fix 'dummy ours merge strategy' display Display the text as text and the command as console source. --- book/08-customizing-git/sections/attributes.asc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/book/08-customizing-git/sections/attributes.asc b/book/08-customizing-git/sections/attributes.asc index 7bab9623..ec7fdd64 100644 --- 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: