mergetools / gvimdiff3on commit update-index: warn in case of split-index incoherency (6cc1053)
   1. "$MERGE_TOOLS_DIR/vimdiff"