mergetools / gvimdiff3on commit Handle more file writes correctly in shared repos (ea56518)
   1. "$MERGE_TOOLS_DIR/vimdiff"