Skip to content

merge_tools: allow setting conflict marker style per-tool#4951

Merged
scott2000 merged 1 commit intojj-vcs:mainfrom scott2000:merge-tool-conflict-marker-styleNov 26, 2024
+442-23

Commits

Commits on Nov 26, 2024