summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-19 00:56:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-19 00:58:06 (GMT)
commit385c171a018f2747b329bcfa6be8eda1709e5abd (patch)
tree9db1c23ce22dd4c21f907450d1f7db743b244c4e /git-merge-ours.sh
parent80cacaec41b0fde4900ffef5f4374a9365db0755 (diff)
downloadgit-master.zip
git-master.tar.gz
git-master.tar.bz2
Fifteenth batchHEADmaster
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions