@travis vimdiff is useful.
@psklf it looks it! also looking at https://meldmerge.org/
Meld

@travis Facing with heavy merge stuff, the meld is more powerful and vimdiff is more light weight.
@psklf yeah, my merge stuff is.. very not heavy :D i've been working on getting #gitlab up via #helm, and i wanna compare my modified values.yaml to the stock values.yaml. i just want a good way to visualize the differences between the two files.
@travis I choose vimdiff
@psklf yeah, i generally like to use TUI tools for that kind of thing.. especially because i'm using a terminal for #kubectl, #helm, and #vim already.