OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
325ba14
56ac168
)
Merge branch 'ew/apply'
author
Junio C Hamano
<junkio@cox.net>
Tue, 25 Jul 2006 19:50:23 +0000
(12:50 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 25 Jul 2006 19:50:23 +0000
(12:50 -0700)
* ew/apply:
Fix t4114 on cygwin
apply: handle type-changing patch correctly.
apply: split out removal and creation into different phases.
apply: check D/F conflicts more carefully.
typechange tests for git apply (currently failing)
Trivial merge