mergetools / gvimdiff2on commit Merge branch 'tz/gpg-test-fix' (154f220)
   1. "$MERGE_TOOLS_DIR/vimdiff"