Merge branch 'maint'
commit27e4dd8de76bdd60c88003e0f27cee8ad26c5cd6
authorJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:56:04 +0000 (21 22:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:56:04 +0000 (21 22:56 -0800)
tree3fa180f4495853016b854cc524c425cbbc905845
parent95f2fb7d9f84779bf036bb748e245c91bc572840
parente6d40d65df07059fc655fabe62fa5b575ead7815
Merge branch 'maint'

* maint:
  diff --check: fix off by one error
  spurious .sp in manpages
diff.c