summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2010-10-04 17:51:47 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-05 08:41:58 -0700
commit95ae69b95ba595d884d31a5cee92a823ec0c705f (patch)
tree110055d0b63c3c14bd4da80b37ab4700a9ece128 /git-merge-resolve.sh
parentMerge early part of git-svn into maint (diff)
downloadtgif-95ae69b95ba595d884d31a5cee92a823ec0c705f.tar.xz
diffcore-pickaxe.c: remove unnecessary curly braces
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions