diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-25 19:10:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 19:10:13 -0800 |
| commit | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 (patch) | |
| tree | 1b263acc52608ae716096abfba527f8b58b3e750 /patch-delta.c | |
| parent | 6c09c451389ade6477d98b05d277aab0dd2f272e (diff) | |
| parent | 0b1f6475570b915c56f380f2bd790ff94e606ef4 (diff) | |
| download | git-5569dad48e22e7b373ce3ffcc32758163bbd7b42.tar.gz git-5569dad48e22e7b373ce3ffcc32758163bbd7b42.tar.xz | |
Merge branch 'maint'
* maint:
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
Diffstat (limited to 'patch-delta.c')
0 files changed, 0 insertions, 0 deletions