delta/libgit2.git/include/git2/sys/merge.h, branch ethomson/template github.com: libgit2/libgit2.git merge_driver: fix const-correctness for source getters 2017-03-15T10:46:15+00:00 Patrick Steinhardt ps@pks.im 2017-03-15T10:46:15+00:00 bb342159d83a697461c23b0abfe9bc8e563d7346 






merge driver: remove `check` callback
2016-03-17T15:06:00+00:00

Edward Thomson
ethomson@github.com

2016-02-28T14:34:11+00:00

6d8b2cdbee00f2c4e97796b52e05dd39bd655138

Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.





Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.







merge driver: improve inline documentation
2016-03-17T15:06:00+00:00

Edward Thomson
ethomson@github.com

2016-02-27T21:57:12+00:00

3f7d3df1ecc0ed7c31427aa37a8de62026c7edef












merge driver: introduce custom merge drivers
2016-03-17T15:02:26+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-12-23T16:23:08+00:00

3f04219fcdcbc6369270eaf2d878d4fe7064254d

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.





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.