seanh

#!/bin/env python
"""mergelog

This is a custom merge driver for git. It should be called from git
with a stanza in .git.config like this:

    [merge "mergelog"]
        name = A custom merge driver for my log.txt file.
        driver = ~/scripts/mergelog %O %A %B %L
        recursive = binary