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

Passed fmt 5s

raw log