unsloth: compare add/add conflicts on content, not on the braces around it - #170

unsloth: compare add/add conflicts on content, not on the braces around it#170

danielhanchen merged 3 commits into

masterunslothai/llama.cpp:masterfrom

additive-merge/structural-linesunslothai/llama.cpp:additive-merge/structural-linesCopy head branch name to clipboard