mergetools / gvimdiff3on commit diff.c: add --output-indicator-{new, old, context} (7648b79)
   1. "$MERGE_TOOLS_DIR/vimdiff"