test mergetool - fixes #3
Merge remote-tracking branch 'origin/test-mergetool'