diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:00:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:00:46 -0700 |
| commit | 606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d (patch) | |
| tree | fd9957b9fef3c0165a0bb1b55708812c0395f12f /ll-merge.h | |
| parent | Merge branch 'im/hashcmp-optim' (diff) | |
| parent | Documentation: clarify meaning of --html-path, --man-path, and --info-path (diff) | |
| download | tgif-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.xz | |
Merge branch 'js/info-man-path'
* js/info-man-path:
Documentation: clarify meaning of --html-path, --man-path, and --info-path
git: add --info-path and --man-path options
Conflicts:
Makefile
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions