summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:37:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:37:15 -0700
commit9fabc7083275f455ef21123cbdcbdd31b21a8251 (patch)
tree14f05d7d29b5262ad1702e2de2dd6e323cb029e2 /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'mp/upload-pack-use-embedded-args' into maint (diff)
parentdir: store EXC_FLAG_* values in unsigned integers (diff)
downloadtgif-9fabc7083275f455ef21123cbdcbdd31b21a8251.tar.xz
Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint
Code clean-up. * ss/exc-flag-is-a-collection-of-bits: dir: store EXC_FLAG_* values in unsigned integers
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions