• Show log

    Commit

  • Hash : 3f04219f
    Author : Edward Thomson
    Date : 2015-12-23T10:23:08

    merge driver: introduce custom merge drivers Consumers can now register custom merged drivers with `git_merge_driver_register`. This allows consumers to support the merge drivers, as configured in `.gitattributes`. Consumers will be asked to perform the file-level merge when a custom driver is configured.