mergetools / gvimdiff3on commit rev-list: handle missing tree objects properly (7c0fe33)
   1. "$MERGE_TOOLS_DIR/vimdiff"