summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAllan Caffee <allan.caffee@gmail.com>2009-04-13 18:10:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-27 16:36:14 (GMT)
commit345f6e2cb547007da48ef503f00070cdcca04975 (patch)
treea471b7a6835d742856127625ac84f20e0da42411 /Documentation
parentc2318228ab327999520b2e5dbc9edbd619a73105 (diff)
downloadgit-345f6e2cb547007da48ef503f00070cdcca04975.zip
git-345f6e2cb547007da48ef503f00070cdcca04975.tar.gz
git-345f6e2cb547007da48ef503f00070cdcca04975.tar.bz2
builtin-merge: fix a typo in an error message
Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions