summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-23 14:13:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-23 14:13:08 -0700
commit76be4487f08d40bd1dba0d5b0dcbd2513ca26e8c (patch)
treebc815e24db637b9cbfc3e48c98d3b549f8a8b352 /contrib/examples/git-merge-ours.sh
parentMerge branch 'kw/rebase-progress' (diff)
parentdoc: clarify "config --bool" behaviour with empty string (diff)
downloadtgif-76be4487f08d40bd1dba0d5b0dcbd2513ca26e8c.tar.xz
Merge branch 'ah/doc-empty-string-is-false'
Doc update. * ah/doc-empty-string-is-false: doc: clarify "config --bool" behaviour with empty string
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions