← d552bfff Merge pull request #16915 from gitbutlerapp/gb-resolve-conflicts-commit-flag

Passed test-without-nightly 1m21s

raw log