push-to-deploy: allow pushing into an unborn branch and updating it

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index c45a020301c16614057912b9a26d1466a94654a9..a40d3dfea6799e5a257dc70c82b88cacc62bdcc0 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -250,7 +250,7 @@ list_merge_tool_candidates () {
                        tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
                fi
                tools="$tools gvimdiff diffuse diffmerge ecmerge"
-               tools="$tools p4merge araxis bc3 codecompare"
+               tools="$tools p4merge araxis bc codecompare"
        fi
        case "${VISUAL:-$EDITOR}" in
        *vim*)