Code

Merge branch 'dz/apply-again'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:10 +0000 (16:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Jul 2008 23:22:10 +0000 (16:22 -0700)
commit7ebd52aa0e58df6bac5f0f87a591da17eb3324a6
tree72cb53f7847114674455d1d8d672e56591d09420
parenta08ca90938cf88c138edfd9f747d44ef1acf0c05
parent7a07841c0ba8d791dd4c7363eaf004b4a7d11fb6
Merge branch 'dz/apply-again'

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