mergetools / gvimdiff3on commit apply: convert threeway_stage to object_id (d07d4ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"