difftool has a great user friendly option for viewing diffs. It is the --dir-diff option - allowing you to arbitrarily browse through two directories.

The git mergetool has a very clumsy and unfriendly user interface. Solving merge conflicts has to be done in a strict order given by git.

Is there a possibility to setup a similar option like

$ git difftool --dir-diff

say

$ git mergetool --dir-merge

calling the directory compare of e.g. winmerge? Or do one has an alternative solution to provide a user friendly interface for solving multiple file merge conflicts?

git git-merge-conflict
Edit
Report