projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 722f53c ee95ec5)
Merge branch 'js/merge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 19:57:19 +0000 (11:57 -0800)
committerJunio 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


Trivial merge
Git—the stupid content tracker