From: Alexander Gladysh <agladysh@gmail.com>
Date: Tue, 20 May 2008 08:02:44 GMT
Subject: git mergetool vs stash apply
Message-ID: <c6c947f60805200102h3fd27742vfd9310912907cfa@mail.gmail.com>

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.