mergetools / gvimdiff2on commit Merge branch 'rm/subtree-unwrap-tags' (a039a79)
   1. "$MERGE_TOOLS_DIR/vimdiff"