mergetools / gvimdiff2on commit Merge branch 'fc/fast-export-persistent-marks' (dbbc93b)
   1. "$MERGE_TOOLS_DIR/vimdiff"