mergetools / gvimdiff2on commit Merge branch 'jp/index-with-corrupt-stages' (0463184)
   1. "$MERGE_TOOLS_DIR/vimdiff"