src/plugins/git/stashdialog.cpp · 5f2fe51c52e11c67ab66cfad43c02c7e004cfb8c · Marco Bubke / flatpak-qt-creator

11 years ago

Git: Suggest mergetool on stash restore conflicts · 647c65c9

Orgad Shaneh authored 11 years ago


Removed warning popup, but stderr is still visible in Version Control pane

Change-Id: I6f5779f0382b8ead1e7140eb6ad533ea0c91dcc2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

647c65c9

History

Git: Suggest mergetool on stash restore conflicts

Orgad Shaneh authored 11 years ago


Removed warning popup, but stderr is still visible in Version Control pane

Change-Id: I6f5779f0382b8ead1e7140eb6ad533ea0c91dcc2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>