Chezmoi 3-Way Diff Merge
When running chezmoi merge ~/path/to/file.ext, you may encounter a warning about the files being out of date, with the option to cancel, merge, or overwrite. If you choose to merge, a 3-way diff will open, and the controls are confusing.
In the 3-column diff view, the middle column will be the "keep" file. You merge changes into the middle from either the left or the right, by selecting that column and the line you want to merge using :diffget 1
Steps:
Ctrl-w l: Move from left pane to middle pane
:diffget 1: Copy the differing hunk from pane/buffer 1, the left destination, into the middle source