summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorBob Proulx <bob@proulx.com>2007-01-11 23:45:38 -0700
committerJunio C Hamano <junkio@cox.net>2007-01-12 00:13:34 -0800
commit397dfe67c71fdd673bb108b9c6103e4a5e750edb (patch)
tree80b99c987be0e082eb31d037e311b55611e6d6e8 /merge-recursive.c
parentfc41be3b2e2eb2135e560077fc705dab7aade5f0 (diff)
downloadgit-397dfe67c71fdd673bb108b9c6103e4a5e750edb.tar.gz
git-revert: Fix die before git-sh-setup defines it.
The code previously checked it's own name and called 'die' upon an error. However 'die' was not yet defined because git-sh-setup had not been sourced yet. Instead simply write the error message to stderr and exit with an error as was originally desired. Signed-off-by: Bob Proulx <bob@proulx.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions