refactor: improve ConflictResolver API with current/proposed context#35

brunoga merged 1 commit into

mainbrunoga/deep:mainfrom

refactor/conflict-resolver-apibrunoga/deep:refactor/conflict-resolver-apiCopy head branch name to clipboard