diff options
author | Pierre Habouzit <madcoder@debian.org> | 2006-08-23 10:39:10 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-24 01:47:38 (GMT) |
commit | 60b7f38e0e08867b72022de5c20715d8eb72de24 (patch) | |
tree | a2aaa9ebf3994e5257a27c18873312246b18c86f /xdiff-interface.h | |
parent | b05faa2da9ec24d737bbba47c71e815255f3eaa7 (diff) | |
download | git-60b7f38e0e08867b72022de5c20715d8eb72de24.zip git-60b7f38e0e08867b72022de5c20715d8eb72de24.tar.gz git-60b7f38e0e08867b72022de5c20715d8eb72de24.tar.bz2 |
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>
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions