mergetools / vimdiff3on commit headers: normalize the spelling of some header guards (0009d35)
   1. "$MERGE_TOOLS_DIR/vimdiff"