Add forked Git, Remove forked Winmerge