dir-iterator: use warning_errno when possible

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 696eb491609ca08a037e04b24cd01384f74d525d..204a5acd66f5444412f0088b8df6cb0ae2fd6b41 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -283,6 +283,7 @@ list_merge_tool_candidates () {
                fi
                tools="$tools gvimdiff diffuse diffmerge ecmerge"
                tools="$tools p4merge araxis bc codecompare"
+               tools="$tools smerge"
        fi
        case "${VISUAL:-$EDITOR}" in
        *vim*)