summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <stefanbeller@googlemail.com>2013-09-15 17:33:22 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-17 13:34:57 -0700
commit0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257 (patch)
tree795f0d057feaa5a2828d883c0e0aea90ce3768b5 /contrib/examples/git-merge-ours.sh
parentrepack: retain the return value of pack-objects (diff)
downloadtgif-0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257.tar.xz
repack: improve warnings about failure of renaming and removing files
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions