Mergiraf: syntax-aware merging for Git (via mpweiher) — discussion

#vcs