Upstream/split off diff3 (merge) implementation - Githubissues

maghoff / sausagewiki

A simple, self-contained Wiki engine

GNU General Public License v3.0

99 stars 5 forks source link

Upstream/split off diff3 (merge) implementation #46

Open maghoff opened 6 years ago