mergetools / gvimdiff3on commit transport-helper: die on errors reading refs. (ae25fd3)
   1. "$MERGE_TOOLS_DIR/vimdiff"