Details
-
Bug
-
Resolution: Done
-
Not Evaluated
-
Qt Creator 3.1.1
-
None
-
Windows (XP and 7)
-
b79449beddfc8c005c7bab6febdab2162827e735
Description
When the mergetool is closed, there's a prompt "Continue merging other unresolved paths (y/n) ?".
Both values don't work, and the mergetool remains frozen forever.
On Linux it works fine.
IIRC the same issue happened to me also for submodule conflict.
Deleted/Modified conflict does work as expected.
This is very strange, since the script looks just the same for all of these.
Any help will be appreciated...
Attachments
For Gerrit Dashboard: QTCREATORBUG-12335 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
86592,1 | Git: Fix mergetool prompt replies | master | qt-creator/qt-creator | Status: MERGED | +2 | 0 |