avoid to use error that shadows the function name, use err instead.
commit60b7f38e0e08867b72022de5c20715d8eb72de24
authorPierre Habouzit <madcoder@debian.org>
Wed, 23 Aug 2006 10:39:10 +0000 (23 12:39 +0200)
committerJunio C Hamano <junkio@cox.net>
Thu, 24 Aug 2006 01:47:38 +0000 (23 18:47 -0700)
treea2aaa9ebf3994e5257a27c18873312246b18c86f
parentb05faa2da9ec24d737bbba47c71e815255f3eaa7
avoid to use error that shadows the function name, use err instead.

builtin-apply.c and builtin-push.c uses a local variable called 'error'
which shadows the error() function.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-apply.c
builtin-push.c