From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jun 2009 07:49:40 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~89
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=433e972aeb5e485d2f7a7ac605a1c043822e25d9;p=git.git

Merge branch 'maint'

* maint:
  blame: correctly handle a path that used to be a directory
  add -i: do not dump patch during application
  Update draft release notes for 1.6.3.2
  grep: fix colouring of matches with zero length
  Documentation: teach stash/pop workflow instead of stash/apply
  Change xdl_merge to generate output even for null merges
  t6023: merge-file fails to output anything for a degenerate merge
---

433e972aeb5e485d2f7a7ac605a1c043822e25d9