aboutsummaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-28 13:52:27 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-28 13:52:27 -0700
commit1c91ec0b8ea750584b4657b9a38413e02b3956ad (patch)
tree261ea924ccae8650991f16b21c1ca1cd30131511 /merge.c
parent310b94528c9a66f0293b8fd7dca4386e579902de (diff)
parentba6746c08fd6cff7da3e435a086515b8d80862c2 (diff)
downloadgit-1c91ec0b8ea750584b4657b9a38413e02b3956ad.tar.gz
git-1c91ec0b8ea750584b4657b9a38413e02b3956ad.tar.xz
Merge branch 'rs/path-name-safety-cleanup' into maint
Code clean-up. * rs/path-name-safety-cleanup: revision: remove declaration of path_name()
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions