مساعد تعارضات الدمج

Everything happens in your browser — paste a file's contents (with its <<<<<<< conflict markers), nothing is uploaded. If your conflict includes a common-ancestor section (diff3 style, |||||||), it's parsed but not shown — only "ours" and "theirs" are used for resolution.