summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 17:10:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 17:10:18 -0700
commit4f4fa9c228a1ac2854c0814b5b23df43b8d98203 (patch)
tree3c104c7a2bd7127a14ca5811bb32bf6269fa0334 /userdiff.h
parentMerge branch 'mh/fix-send-email-threaded' (diff)
parentMerge branch 'maint-1.6.2' into maint (diff)
downloadtgif-4f4fa9c228a1ac2854c0814b5b23df43b8d98203.tar.xz
Merge branch 'maint'
* maint: git-rerere.txt: grammatical fixups and cleanups
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions