mergetools / gvimdiff2on commit Merge branch 'sb/unpack-trees-would-lose-submodule-message-update' (c8a8951)
   1. "$MERGE_TOOLS_DIR/vimdiff"