summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Alex Henrie <alexhenrie24@gmail.com>2016-06-25 00:34:04 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-27 08:29:36 -0700
commitc2691e2add93453cfbcfe11ffcf2880d107d67f8 (patch)
treeade188af5f62fca04154700a9285bb9b32ff3cec /xdiff/xmerge.c
parentGit 2.9 (diff)
downloadtgif-c2691e2add93453cfbcfe11ffcf2880d107d67f8.tar.xz
unpack-trees: fix English grammar in do-this-before-that messages
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions