mergetools / gvimdiff2on commit Merge branch 'en/rerere-multi-stage-1-fix' (bd3941a)
   1. "$MERGE_TOOLS_DIR/vimdiff"