diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 14:59:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 14:59:10 -0800 |
| commit | 6a2e93f1074d5a8b25c2020805e6b8d795d13e4d (patch) | |
| tree | 137792eaffc80800186318ae6c894144fda8ffbb /git-merge-octopus.sh | |
| parent | Merge branch 'dk/maint-blame-el' (diff) | |
| parent | diff: don't use pathname-based diff drivers for symlinks (diff) | |
| download | tgif-6a2e93f1074d5a8b25c2020805e6b8d795d13e4d.tar.xz | |
Merge branch 'jk/no-textconv-symlink'
* jk/no-textconv-symlink:
diff: don't use pathname-based diff drivers for symlinks
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions