mergetools / gvimdiff2on commit Merge branch 'jn/gc-auto-prep' (99913dd)
   1. "$MERGE_TOOLS_DIR/vimdiff"