mergetools / vimdiff2on commit Merge branch 'mg/gpg-interface-using-status' (0f6875d)
   1. "$MERGE_TOOLS_DIR/vimdiff"