How do I selectively accept LOCAL or REMOTE changes in a three-way git merge using Vim?
:diffget LOCAL
When Vim is configured as a git mergetool, it opens a three-way split with the LOCAL (your branch), REMOTE (their branch), and MERGED (the output file) buffers.
buffers-windows #buffers-windows #diff #editing #command-line