Hi, list!

The git mergetool ignores conflicts by git stash apply:

$ git stash apply
Auto-merged path/file.ext
CONFLICT (content): Merge conflict in path/file.ext

$ git mergetool
merge tool candidates: kdiff3 kdiff3 tkdiff xxdiff meld gvimdiff
opendiff emerge vimdiff
No files need merging

While path/file.ext do contain merge conflict.

The git mergetool works for git merge and git rebase. Maybe it should
work for git stash as well? I automatically type git mergetool when I
see CONFLICT in Git output. %-)

Alexander.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html