Commit 57ee5d5084c5c07c321352b7412a51d2f89ef298

Stefan Sperling 2019-02-08T15:10:49

allow callers of diff3 code to detect merge conflicts