![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | 0b1f6475570b915c56f380f2bd790ff94e606ef4 | |
| tree | 8fb327c2cf258674d67ff9a60261f3eade002e54 | tree | snapshot |
| parent | d2dc6222d4e2f7fa5efc82175d14d60d7b804687 | commit | diff |
| parent | 17cd29b25c0f480a3c6e1dd9617d9c6046e3c280 | commit | diff |
Merge branch 'jc/merge-symlink' into maint
* jc/merge-symlink:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
* jc/merge-symlink:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks