author | Junio C Hamano <gitster@pobox.com> | |
Wed, 27 Feb 2008 19:57:19 +0000 (11:57 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 27 Feb 2008 19:57:19 +0000 (11:57 -0800) |
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Trivial merge