summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 11:00:46 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 11:00:46 -0700
commit606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d (patch)
treefd9957b9fef3c0165a0bb1b55708812c0395f12f /userdiff.h
parentefa67bfd16f4260275654bc4194744dd65353350 (diff)
parent239b5ed9c9b7b7f219b05c8d71e29db7b970eb48 (diff)
downloadgit-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.gz
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 'userdiff.h')
0 files changed, 0 insertions, 0 deletions