From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Jul 2008 23:22:10 +0000 (-0700)
Subject: Merge branch 'dz/apply-again'
X-Git-Tag: v1.6.0-rc0~181
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ebd52a;p=git.git

Merge branch 'dz/apply-again'

* dz/apply-again:
  git-apply: handle a patch that touches the same path more than once better
---

7ebd52aa0e58df6bac5f0f87a591da17eb3324a6