diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-25 19:09:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 19:09:59 -0800 |
| commit | 0b1f6475570b915c56f380f2bd790ff94e606ef4 (patch) | |
| tree | 8fb327c2cf258674d67ff9a60261f3eade002e54 /combine-diff.c | |
| parent | d2dc6222d4e2f7fa5efc82175d14d60d7b804687 (diff) | |
| parent | 17cd29b25c0f480a3c6e1dd9617d9c6046e3c280 (diff) | |
| download | git-0b1f6475570b915c56f380f2bd790ff94e606ef4.tar.gz git-0b1f6475570b915c56f380f2bd790ff94e606ef4.tar.xz | |
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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions