summaryrefslogtreecommitdiff
path: root/ws.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:10 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:10 -0700
commit7ebd52aa0e58df6bac5f0f87a591da17eb3324a6 (patch)
tree72cb53f7847114674455d1d8d672e56591d09420 /ws.c
parenta08ca90938cf88c138edfd9f747d44ef1acf0c05 (diff)
parent7a07841c0ba8d791dd4c7363eaf004b4a7d11fb6 (diff)
downloadgit-7ebd52aa0e58df6bac5f0f87a591da17eb3324a6.tar.gz
Merge branch 'dz/apply-again'
* dz/apply-again: git-apply: handle a patch that touches the same path more than once better
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions