aboutsummaryrefslogtreecommitdiff
path: root/count-delta.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-25 00:12:06 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-26 18:04:17 -0700
commitdeca7e8c591608c9ffd0bf0aaf10b379da9f6d6e (patch)
tree49b93d4d45cd52f4c05b1030d05b4b8329c5824a /count-delta.c
parente2f5f6ef6795c880a2f13ea472b96704b4a4ca94 (diff)
downloadgit-deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e.tar.gz
git-deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e.tar.xz
Give default merge message after failed automerge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'count-delta.c')
0 files changed, 0 insertions, 0 deletions