Skip to content

Added simple 3 way merge for unknown files instead of override. - #798

Open
JEdward7777 wants to merge 1 commit into
genesis-ai-dev:mainfrom
JEdward7777:JEL_improve_default_merge
Open

Added simple 3 way merge for unknown files instead of override.#798
JEdward7777 wants to merge 1 commit into
genesis-ai-dev:mainfrom
JEdward7777:JEL_improve_default_merge

Added simple 3 way merge for unknown files instead of override.

f0b74f9
Select commit
Loading
Failed to load commit list.
Sign in for the full log view