summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-06 12:19:06 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-06 12:19:06 -0700
commit00480a1e9ccd44f257c09c45c185c9c8825a3078 (patch)
tree092f9134bfdc05a8bb6d5c36ccb9852971087dcf /merge.c
parentd4f6b5f51ce2c974c7630b5491562a21821c8fe4 (diff)
parent2f0aaaf9dabd846061a759b53ff4759ec886df62 (diff)
downloadgit-00480a1e9ccd44f257c09c45c185c9c8825a3078.tar.gz
Merge branch 'rj/mingw-compat-st-mode-bits'
* rj/mingw-compat-st-mode-bits: path: Fix a sparse warning
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions