Junio C Hamano 456cb4cf3e Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint ... * cb/maint-1.6.0-xdl-merge-fix: Change xdl_merge to generate output even for null merges t6023: merge-file fails to output anything for a degenerate merge Conflicts: xdiff/xmerge.c		2009-06-02 07:48:44 -07:00
..
xdiff.h
xdiffi.c
xdiffi.h
xemit.c
xemit.h
xinclude.h
xmacros.h
xmerge.c	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	2009-06-02 07:48:44 -07:00
xpatience.c
xprepare.c
xprepare.h
xtypes.h
xutils.c
xutils.h