From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 14 Dec 2007 00:17:42 GMT
Subject: Re: [PATCH 2/5] New version of pre-commit hook
Message-ID: <fjsi37$7ji$1@ger.gmane.org>
In-Reply-To: <1197552751-53480-3-git-send-email-win@wincent.com>

Wincent Colaiuta wrote:

> Now that "git diff --check" indicates problems with its exit code the
> pre-commit hook becomes a trivial one-liner.

> -         if (/^(?:[<>=]){7}/) {
> -             bad_line("unresolved merge conflict", $_);
> -         }

Aren't you losing this check with rewrite?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git