Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/maint-merge-recursive-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000
(11:34 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000
(11:34 -0700)
* jc/maint-merge-recursive-fix:
merge-recursive: don't segfault while handling rename clashes
1
2
merge-recursive.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
d3ebb17
c94736a
)
diff --cc
merge-recursive.c
Simple merge