mergetools / gvimdiff2on commit trace: move code around, in preparation to file:line output (66f66c5)
   1. "$MERGE_TOOLS_DIR/vimdiff"