mergetools / gvimdiffon commit push --force-with-lease: implement logic to populate old_sha1_expect[] (91048a9)
   1. "$MERGE_TOOLS_DIR/vimdiff"