mergetools / gvimdiffon commit transport-helper: trivial code shuffle (9c51558)
   1. "$MERGE_TOOLS_DIR/vimdiff"