Return-Path: <jrollins@finestructure.net>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id B3ABD429E29
	for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:34 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -2.3
X-Spam-Level: 
X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id iTpEjTBcG9-u for <notmuch@notmuchmail.org>;
	Sun, 13 Nov 2011 11:15:32 -0800 (PST)
Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
	[131.215.239.19])
	by olra.theworths.org (Postfix) with ESMTP id B0D06431FB6
	for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:32 -0800 (PST)
Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
	by fire-doxen-postvirus (Postfix) with ESMTP id 49BF02E50D96
	for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:30 -0800 (PST)
X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
Received: from finestructure.net (cpe-76-174-136-149.socal.res.rr.com
	[76.174.136.149]) (Authenticated sender: jrollins)
	by fire-doxen-submit (Postfix) with ESMTP id 9E5152E50D65
	for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:28 -0800 (PST)
Received: by finestructure.net (Postfix, from userid 1000)
	id 3DEC2B57; Sun, 13 Nov 2011 11:15:28 -0800 (PST)
From: Jameson Graef Rollins <jrollins@finestructure.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: 
Date: Sun, 13 Nov 2011 11:15:19 -0800
Message-Id: <1321211721-7608-1-git-send-email-jrollins@finestructure.net>
X-Mailer: git-send-email 1.7.7.1
In-Reply-To: <87ipmo69hi.fsf@zancas.localnet>
References: <87ipmo69hi.fsf@zancas.localnet>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Nov 2011 19:15:35 -0000

So this is incredibly confusing to me, but git is supposedly doing
something clever that allows these patches to apply in my repo but not
in a clean one.

In any event, I'm resending the patches after being applied to my
master, which should resolve any conflict and allow them to apply.

jamie.