![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | cb99be7c7d2afc71106ffaf400c769c8e72f1bb2 | |
| tree | 66a78ff99d45bf4c9c1dba5867c48c08b0b44df5 | tree | snapshot |
| parent | 722f53ca2feed5e41c2270fdaae25bde5b7582f4 | commit | diff |
| parent | ee95ec5d58d536243966de6ee810d345074b755e | commit | diff |
Merge branch 'js/merge'
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler