mergetools / gvimdiffon commit ewah: use less generic macro name (34b935c)
   1. "$MERGE_TOOLS_DIR/vimdiff"