Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/merge-symlink' into maint
author
Junio C Hamano
<junkio@cox.net>
Mon, 26 Feb 2007 03:09:59 +0000
(19:09 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 26 Feb 2007 03:09:59 +0000
(19:09 -0800)
* jc/merge-symlink:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
raw
|
combined
(merge:
d2dc622
17cd29b
)
Trivial merge