mergetools / gvimdiffon commit Merge branch 'dg/subtree-fixes' (260adc8)
   1. "$MERGE_TOOLS_DIR/vimdiff"