mergetools / gvimdiff2on commit rerere: add documentation for conflict normalization (fb90dca)
   1. "$MERGE_TOOLS_DIR/vimdiff"