mergetools / vimdiff2on commit Merge branch 'fp/subtree-todo-update' (1bc8fea)
   1. "$MERGE_TOOLS_DIR/vimdiff"