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
Fix two grammatical errors

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Expand undefined alias

"lga" is not defined anywhere in the text; all other examples use explicit "git log ..."

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Merge pull request #171 from tacker66/some_more_fixes

Some more fixes
add layout for epub metadata
Always use `repo` as reference to JGit repo

Was simplified to `r`
Merge pull request #172 from progit/epub-metadata

Add layout for epub metadata
Merge pull request #173 from zigarn/jgit-code-fix

Always use `repo` as reference to JGit repo
Only only

Fixes #174
Merge remote-tracking branch 'upstream/master'