![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 03:10:13 +0000 (19:10 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 03:10:13 +0000 (19:10 -0800) |
* maint:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
Trivial merge