aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2017-05-26 01:20:46 +0200
committerJunio C Hamano <gitster@pobox.com>2017-05-26 12:21:07 +0900
commit449456ad47e4074d6d2ee1d1d8178ab29848a137 (patch)
tree8cca2b1da0dd4299a54cb24749beeee7a80d5241 /builtin/merge-ours.c
parentecdab4126793194e7181afa967deaf8e805a09b9 (diff)
downloadgit-449456ad47e4074d6d2ee1d1d8178ab29848a137.tar.gz
git-449456ad47e4074d6d2ee1d1d8178ab29848a137.tar.xz
docs/config.txt: fix indefinite article in core.fileMode description
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions