git-merge-ours.shon commit Add 'ours' merge strategy. (64da9e6)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5# Pretend we resolved the heads, but declare our tree trumps everybody else.
   6#
   7exit 0