mergetools / gvimdiffon commit docs/merge-strategies: remove hyphen from mis-merges (13f72a1)
   1. "$MERGE_TOOLS_DIR/vimdiff"