diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-10 18:05:00 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-11 10:30:43 +0200 |
| commit | 5cb29aec0b104179919d14573c7af88610c39e87 (patch) | |
| tree | 2c3143bf968b475d076be49f90e3b164c592854c /src/plugins/git/gitplugin.cpp | |
| parent | e97a56560542564b3e2cf6c7b731e92df48de3e5 (diff) | |
| download | qt-creator-5cb29aec0b104179919d14573c7af88610c39e87.tar.gz | |
Git: Initialize ConflictHandler before executing command
expectDirectoryChange is called by ConflictHandler. After the command
is executed it is too late
Change-Id: I27e82fd2a979a043932b4a838f3736cbe0f60107
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
0 files changed, 0 insertions, 0 deletions