Implement automatic fast-forward merge for submodules
[gitweb.git] / xdiff / xmerge.c
2006-12-03 xdiff: add xdl_merge()