mergetools / gvimdiffon commit Merge branch 'tr/test-commit-only-on-orphan' (9845bbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"