- #Git mergetool p4merge ubuntu install
- #Git mergetool p4merge ubuntu Patch
- #Git mergetool p4merge ubuntu code
#Git mergetool p4merge ubuntu Patch
Really what I personally would like to see is BASE, LOCAL, REMOTE, and REMOTE-DIFF – the latter being what patch would show for remote commit which is usually what I someone wants to apply. I agree what you are asking for would be useful. But I am not personally aware of tools that do that (the commands meld and diffuse suggested in other answer do not). In that case it could get the info you are suggesting. In theory someone could write a tool that queries git to find out the merge state rather than being called by git as a mergetool. configure meld as git mergetool ubuntu Awgiedawgie git config -global diff.tool meld git config -global '/usr/bin/meld' git config -global difftool.prompt false git config -global merge.tool meld git config -global '/usr/bin/meld' git config -global mergetool.