Add option to always report a conflict when the tool merged a file automatically.#18

Open

MaPePeR wants to merge 3 commits intobalbuf:masterfrom

MaPePeR:always_conflict

Commits on Nov 18, 2025

Move argument parsing to the top of the file
MaPePeR
committed
Add option to always report a conflict when the tool merged a file automatically.
MaPePeR
committed

Commits on Dec 15, 2025

Add option to only always conflict if the merged file is the lock file
MaPePeR
committed