Improve show method of S4 class git_merge_result

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
Add test case for merge conflict

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>