mergetools / gvimdiff2on commit Merge branch 'jk/gpg-interface-cleanup' (ed0f7bd)
   1. "$MERGE_TOOLS_DIR/vimdiff"