summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:14:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-03 10:14:05 -0800
commitcd46f2e59de2df74844c9c594bfbfcdea24acd23 (patch)
treeddeb349e87792ae9ce3e584dd5a8166b72332ebe /git-merge-resolve.sh
parentStart 1.8.2 cycle (diff)
parentcompat/fnmatch: update old-style definition to ANSI (diff)
downloadtgif-cd46f2e59de2df74844c9c594bfbfcdea24acd23.tar.xz
Merge branch 'jc/maint-fnmatch-old-style-definition'
Update old-style function definition "int foo(bar) int bar; {}" to "int foo(int bar) {}". * jc/maint-fnmatch-old-style-definition: compat/fnmatch: update old-style definition to ANSI
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions