I sometimes prefer to work in a terminal. I use git, and sometimes have merge conflicts. Are there any merge-conflict-resolution tools that work in a command-line only environment?
- Anybody can ask a question
- Anybody can answer
- The best answers are voted up and rise to the top
From the manpage of "git mergetool":
Out of these, I know that emerge and vimdiff are command-line only. Although it is not listed, emacs' ediff can also be used as a mergetool. http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool
I personally find that graphical tools such as meld makes things much easier.