From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 23 Nov 2007 09:42:25 GMT
Subject: Re: [PATCH] Converted git-merge-ours.sh -> builtin-merge-ours.c
Message-ID: <fi67a2$6jh$1@ger.gmane.org>
In-Reply-To: <4745E45C.7@gmail.com>

Thomas Harning wrote:

> diff --git a/git-merge-ours.sh b/git-merge-ours.sh
> deleted file mode 100755
> index c81a790..0000000
> --- a/git-merge-ours.sh
> +++ /dev/null

Shouldn't script version be moved to contrib/examples/ as is git.git
policy, or is it too simple script?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git