git-merge-ours.sh - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git-merge-ours.sh - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.

summary refs log tree commit diff

path: root/git-merge-ours.sh

blob: a64704f3e52be43b427792ef9c1bbe42af057c87 (plain)

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#
exit 0