summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-01 16:31:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-01 16:31:16 -0700
commit0b20a4680bf668ba2719fa48a9bdbf137253a4b6 (patch)
tree560881d043034a1afda1576ab7e451ecdb962146 /contrib/examples/git-merge-ours.sh
parentMerge branch 'ah/pack-objects-usage-strings' (diff)
parentread-tree: replace bracket set with parentheses to clarify usage (diff)
downloadtgif-0b20a4680bf668ba2719fa48a9bdbf137253a4b6.tar.xz
Merge branch 'ah/read-tree-usage-string'
Usage string fix. * ah/read-tree-usage-string: read-tree: replace bracket set with parentheses to clarify usage
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions