I am using vimdiff as my merge tool. Unfortunately, vim(diff) crashed and it froze my terminal completely, so I had to kill git. That was kinda painful since I lost some of the work I did. My expectation is that git should be able to recover from mergetool crash. I'm actually unsure if git can actually do something about this. Please let me know whether I should report this at vimdiff. My environment is: Fedora 29 vim-enhanced-8.1.847-2.fc29.x86_64 git-core-2.20.1-1.fc29.x86_64 Related bug report: https://github.com/rebase-helper/rebase-helper/issues/564
