Syntax-aware merger driver for Git
