Alex Rivera | Logout

Questions tagged mergetool

2 questions

Sort by: Newest Votes Active
77
votes
16
answers

How can I make WinMerge my git mergetool?

git winmerge difftool mergetool
asked 2012-05-23T05:24:42.487
30
votes
3
answers

How do I make git automatically open the mergetool if there is a merge conflict?

git merge mergetool
asked 2012-04-05T16:18:47.577