mergetools / vimdiff3on commit trace: add infrastructure to augment trace output with additional info (c69dfd2)
   1. "$MERGE_TOOLS_DIR/vimdiff"