pull: support rebased upstream + fetch + pull --rebase
[gitweb.git] / xdiff / xmerge.c
2006-12-03 xdiff: add xdl_merge()