summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-21 18:24:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-21 18:24:12 (GMT)
commit90d79d71910415387590a733808140e770382b2f (patch)
tree4dd77460a731b88a99edc3285aa35e09eef5d228 /builtin/merge.c
parentf9089e8491fdf50d941f071552872e7cca0e2e04 (diff)
parentfc7e03aace379c3d6b00ac977447f115421324fe (diff)
downloadgit-90d79d71910415387590a733808140e770382b2f.zip
git-90d79d71910415387590a733808140e770382b2f.tar.gz
git-90d79d71910415387590a733808140e770382b2f.tar.bz2
Merge branch 'mo/clang-format-for-each-update'
The list of for-each like macros used by clang-format has been updated. * mo/clang-format-for-each-update: clang-format: use git grep to generate the ForEachMacros list
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions