summaryrefslogtreecommitdiff
path: root/qbs
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-03-27 13:40:32 +0200
committerOrgad Shaneh <orgads@gmail.com>2014-03-27 15:11:44 +0100
commit187bb36945a653cdf9738a6563475c87b9db911d (patch)
tree269d101e315ba50bfb19dcc5bdaea7675cfb403d /qbs
parentfec491a290ae760e79f94c8aa4e970e85488b920 (diff)
downloadqt-creator-187bb36945a653cdf9738a6563475c87b9db911d.tar.gz
Git: Continue command after failed merge tool attempt
Change-Id: Ic3b7d4aee51897e226a78979bbecb82f06095b2d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'qbs')
0 files changed, 0 insertions, 0 deletions