Fix 'dummy ours merge strategy' display

Display the text as text and the command as console source.
Merge pull request #170 from zigarn/fix

Fix 'dummy ours merge strategy' display