3ed5f0cc1e
This commit starts not only the rebase support but also manage merges when conflicts appear [WIP]
6 lines
186 B
Kotlin
6 lines
186 B
Kotlin
package app.extensions
|
|
|
|
import org.eclipse.jgit.lib.RepositoryState
|
|
|
|
val RepositoryState.isMerging
|
|
get() = this == RepositoryState.MERGING || this == RepositoryState.MERGING_RESOLVED |