Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:56:04 +0000 (22:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:56:04 +0000 (22:56 -0800)
* maint:
  diff --check: fix off by one error
  spurious .sp in manpages

1  2 
diff.c

diff --cc diff.c
Simple merge