Mergiraf: a syntax-aware merge driver for Git (via dpk) — discussion

#vcs