mergetools / gvimdiffon commit Merge branch 'sg/gpg-tests-fix' (078f3dc)
   1. "$MERGE_TOOLS_DIR/vimdiff"