![[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) | ||
| commit | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 | |
| tree | 1b263acc52608ae716096abfba527f8b58b3e750 | tree | snapshot |
| parent | 6c09c451389ade6477d98b05d277aab0dd2f272e | commit | diff |
| parent | 0b1f6475570b915c56f380f2bd790ff94e606ef4 | commit | diff |
Merge branch 'maint'
* maint:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
* maint:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks