P4merge git mergetool6/1/2023 ![]() Git config 'vimdiff "$LOCAL" "$BASE" "$REMOTE" "$MERGED"' However, I think you can work around it by defining your own tool that Of that to people more interested in mergetool. That sounds kind of confusing to me, but I'll leave discussion TrustExitCode is used only for a "user" tool, not for the builtin tool I don't use mergetool myself, but peeking at the code, it looks like > vimdiff with a non-zero code would prevent git from resolving the > Is there a way to accomplish the desired effect, such that exiting > the merge is still presumed to have succeeded. > Unfortunately, when I exit Vim using `:cq` - which returns code 1. > merge hasn't been successful if vimdiff's exit code is non-zero. ![]() > My understanding from the docs is that this sets > I'm using vimdiff as my mergetool, and have the following lines in 13:46 ` Dun Peal 0 siblings, 1 reply 8 messages in thread 2:44 trustExitCode doesn't apply to vimdiff mergetool Dun 5:08 ` Jeff King
0 Comments
Leave a Reply. |