mergetools / gvimdiffon commit Merge branch 'dg/subtree-test-cleanup' (30fe9b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"