No matches were found for subject:"\[PATCH 1\/2\] mergetool\: honor tempfile configuration when resolving delete conflicts"