src/plugins/git/gitclient.cpp · 879012a50befe51561767aea6095d4f071b3df06 · Marco Bubke / flatpak-qt-creator

11 years ago

Git: Mark forgotten cases as expected to change · 879012a5

Orgad Shaneh authored 11 years ago


* When mergetool is done
* Stash
* Stash pop
* Continue/skip command
* executeAndHandleConflicts
* Interactive rebase

Change-Id: Ic8108b096c367c7777dae06f7ff255999d64fda9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

879012a5

History

Git: Mark forgotten cases as expected to change

Orgad Shaneh authored 11 years ago


* When mergetool is done
* Stash
* Stash pop
* Continue/skip command
* executeAndHandleConflicts
* Interactive rebase

Change-Id: Ic8108b096c367c7777dae06f7ff255999d64fda9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>