progit/progit2 — pull request #170 by zigarn (2014-11-13 10:15:21+00:00)
Title: Fix 'dummy ours merge strategy' display

Display the text as text and the command as console source.