thodg/got

2022-06-27T18:47:02

got patch: handle git-style diffs for the 3-way merge too tweak and ok stsp@