Git: Fix mergetool prompt replies

Task-number: QTCREATORBUG-12335
Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>