Merge branch 'maint'
* maint: merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks
Junio C Hamano committed
Feb 25, 2007 at 19:10 UTC
5569dad48e22e7b373ce3ffcc32758163bbd7b42
No changes.