Fix spelling of overridden in documentation
commitb06743925c3022ffbbd459431531709df13bbf38
authorShawn Bohrer <shawn.bohrer@gmail.com>
Wed, 26 Sep 2007 04:12:46 +0000 (25 23:12 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Sep 2007 06:38:42 +0000 (25 23:38 -0700)
treea8155b8bd320aa4b06c57a5eab91ddecc44176e3
parent4d84aff356d9c6d86a8d621ee577283ed70e145e
Fix spelling of overridden in documentation

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt
Documentation/gitignore.txt