summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorLibravatar Martin Ågren <martin.agren@gmail.com>2021-10-24 19:09:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-25 11:06:56 -0700
commitc314b62553e2abf9055aa58d5e4ed2e5bb8c9f64 (patch)
treecf6f9ff4d2e2005a841521c807e17eee37ca7cb7 /mergetools/diffmerge
parentgit-multi-pack-index.txt: change "folder" to "directory" (diff)
downloadtgif-c314b62553e2abf9055aa58d5e4ed2e5bb8c9f64.tar.xz
gitignore.txt: change "folder" to "directory"
We prefer "directory" over "folder" when discussing the file system concept. Change this instance for consistency -- indeed, even within this paragraph, we already use "directory". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions