From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2008 19:57:19 +0000 (-0800)
Subject: Merge branch 'js/merge'
X-Git-Tag: v1.5.5-rc0~135
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cb99be7c7d2afc71106ffaf400c769c8e72f1bb2;p=git.git

Merge branch 'js/merge'

* js/merge:
  xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
  xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
---

cb99be7c7d2afc71106ffaf400c769c8e72f1bb2