diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-06-23 21:52:00 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-06-24 03:00:43 +0000 |
| commit | 573958e79f1033f502690c5ca2821c8c95f8414b (patch) | |
| tree | 078f7a594c4ed12847e4b12f79aac39dcca0c715 /src/plugins/debugger/debuggeroptionspage.cpp | |
| parent | 53c4b36e4a5ef9abf000a294bf8c6f6d807e27c8 (diff) | |
| download | qt-creator-573958e79f1033f502690c5ca2821c8c95f8414b.tar.gz | |
Git: Prompt for unchanged file after custom mergetool fails
To reproduce, create a conflict and configure a custom mergetool that does
nothing:
git config mergetool.my.cmd true
git config merge.tool my
Then execute merge tool from Qt Creator. The merge tool process hangs
while asking how to handle the unchanged file, and can only be killed
externally.
Change-Id: I4d2a91061bd7549e308f6a25f106e6a7afc5cadb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/debugger/debuggeroptionspage.cpp')
0 files changed, 0 insertions, 0 deletions