aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2015-08-20 15:58:55 +0200
committerJunio C Hamano <gitster@pobox.com>2015-08-20 13:14:21 -0700
commit126984785473ee7a868127d965762fc7a2358339 (patch)
tree7d9b22ace1144ba6d9e08b40d8c9282796c998d4 /builtin/merge.c
parent5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 (diff)
downloadgit-126984785473ee7a868127d965762fc7a2358339.tar.gz
git-126984785473ee7a868127d965762fc7a2358339.tar.xz
t3020: fix typo in test description
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions