mergetools / gvimdiff2on commit log -L: test merge of parallel modify/rename (d51c527)
   1. "$MERGE_TOOLS_DIR/vimdiff"