summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-01 22:35:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-01 22:35:57 -0700
commitf054a419419337142ffe40433aa3984ccc000624 (patch)
tree0d383a217519081fe7243c9f371f5756690afef1 /userdiff.c
parentMerge branch 'maint-1.6.0' into maint-1.6.1 (diff)
parentDocumentation: Remove an odd "instead" (diff)
downloadtgif-f054a419419337142ffe40433aa3984ccc000624.tar.xz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: Documentation: Remove an odd "instead"
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions