I try to merge two commits using git in MSYS2. I need to do it manually, because I need to recover accidently removed text from a previous commit and automatic merging always removes it. I use

git difftool 747e070 de22b0c

which fires emerge. How can I save the resulting buffer when I finish merging?

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy

Browse other questions tagged or ask your own question.