From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29419 invoked by alias); 18 Jul 2012 16:13:33 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 29314 invoked by uid 22791); 18 Jul 2012 16:13:31 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org From: Tom Tromey To: Jan Kratochvil Cc: archer@sourceware.org Subject: Re: [dwz-multifile-rebase] conflict resolution; not pushed References: <20120714211925.GA21897@host2.jankratochvil.net> Date: Wed, 18 Jul 2012 16:13:00 -0000 In-Reply-To: <20120714211925.GA21897@host2.jankratochvil.net> (Jan Kratochvil's message of "Sat, 14 Jul 2012 23:19:25 +0200") Message-ID: <87vchl3v4y.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2012-q3/txt/msg00001.txt.bz2 Jan> FYI I made this local merge but I did not push it, do whatever you Jan> like with it. Jan> (What I pushed I also reverted and it was not a GIT-merge so it should be Jan> a nop.) Thanks. I actually had already done a rebase here, but I did it late on Friday and then didn't think to push it. Sorry about the duplicated work. Tom