projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7fb0eaa) | patch
xdl_merge(): introduce xmparam_t for merge specific parameters
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 05:01:28 +0000 (21:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 05:33:13 +0000 (21:33 -0800)
commit00f8f97d30be7992c16bc466532cb591e00314bf
tree71879ad314076541471bb4ab83d13bdcf74ee02ctree | snapshot
parent7fb0eaa289576a1dcd7751015ba791f1bce778a9commit | diff
xdl_merge(): introduce xmparam_t for merge specific parameters

So far we have only needed to be able to pass an option that is generic to
xdiff family of functions to this function.  Extend the interface so that
we can give it merge specific parameters.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge-file.c diff | blob | history
ll-merge.c diff | blob | history
merge-file.c diff | blob | history
rerere.c diff | blob | history
xdiff/xdiff.h diff | blob | history
xdiff/xmerge.c diff | blob | history
Git—the stupid content tracker