mergetools / gvimdiffon commit Merge branch 'as/subtree-with-spaces' (a66aa25)
   1. "$MERGE_TOOLS_DIR/vimdiff"