| ... | @@ -114,6 +114,7 @@ Safe chunk select / "move to patch" implementation: |
... | @@ -114,6 +114,7 @@ Safe chunk select / "move to patch" implementation: |
|
|
|
|
|
|
|
== Merge ==
|
|
== Merge ==
|
|
|
|
|
|
|
|
|
* QObject::killTimers: timers cannot be stopped from another thread warning on Windows during merge
|
|
|
* detect unresolved conflicts in WD
|
|
* detect unresolved conflicts in WD
|
|
|
* update parent csinfo after commit
|
|
* update parent csinfo after commit
|
|
|
* delay merge tool scan until combo opened
|
|
* delay merge tool scan until combo opened
|
| ... | | ... | |
