mergetools / gvimdiff2on commit cherry-pick: make sure all input objects are commits (21246db)
   1. "$MERGE_TOOLS_DIR/vimdiff"