Skip to content

cli: merge_tools/external: bail out if the files are the same when re-reading conflicts - #9984

Open
winterqt wants to merge 1 commit into
mainfrom
push-smnstoxmwxmv
Open

cli: merge_tools/external: bail out if the files are the same when re-reading conflicts#9984
winterqt wants to merge 1 commit into
mainfrom
push-smnstoxmwxmv

Commits

Commits on Aug 14, 2026