summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-14 00:09:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-14 00:09:50 (GMT)
commit9b7dc7183528d42c46786a0be1acc58d4cd1f47a (patch)
treedf825302756fe359cbc1e5119b7573cbdb1ac5d8 /userdiff.c
parent34ab57df974ad74cc93550bfac2f90d203837a17 (diff)
parentdfe50511c7e5ec2bc771c9a5f4c3318332a7744e (diff)
downloadgit-9b7dc7183528d42c46786a0be1acc58d4cd1f47a.zip
git-9b7dc7183528d42c46786a0be1acc58d4cd1f47a.tar.gz
git-9b7dc7183528d42c46786a0be1acc58d4cd1f47a.tar.bz2
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: git-rerere.txt: grammatical fixups and cleanups
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions