summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-12 09:47:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-12 09:47:36 -0700
commit8a5ad2ba5bacd84c10ec62b0cf5a67d0f147746e (patch)
tree01457c5fb2c0cc3ebb30966eadd138e1eb5117ba /git-difftool--helper.sh
parentMerge branch 'rs/merge-add-strategies-simplification' (diff)
parentmerge-recursive: use STRING_LIST_INIT_NODUP (diff)
downloadtgif-8a5ad2ba5bacd84c10ec62b0cf5a67d0f147746e.tar.xz
Merge branch 'rs/merge-recursive-string-list-init'
A small code clean-up. * rs/merge-recursive-string-list-init: merge-recursive: use STRING_LIST_INIT_NODUP
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions