summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:07:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:07:18 -0700
commit8a3ff8560c4dee53d87a06fecb2effd9b6b4cbfc (patch)
tree8ffb7ee1b5d19789aa4bd112f771ab99ce3a2635 /t/t6037-merge-ours-theirs.sh
parentMerge branch 'js/rebase-helper' (diff)
parentwt-status: simplify by using for_each_string_list_item (diff)
downloadtgif-8a3ff8560c4dee53d87a06fecb2effd9b6b4cbfc.tar.xz
Merge branch 'sb/wt-status-cleanup'
Code clean-up. * sb/wt-status-cleanup: wt-status: simplify by using for_each_string_list_item
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions