This is the mail archive of the archer@sourceware.org mailing list for the Archer project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[dwz-multifile-rebase] conflict resolution; not pushed

From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
To: archer at sourceware dot org
Cc: Tom Tromey <tromey at redhat dot com>
Date: Sat, 14 Jul 2012 23:19:25 +0200
Subject: [dwz-multifile-rebase] conflict resolution; not pushed

Hi Tom,

FYI I made this local merge but I did not push it, do whatever you like with
it.

(What I pushed I also reverted and it was not a GIT-merge so it should be
a nop.)


Jan

Attachment: dwz-merge.patch
Description: Text document

Follow-Ups:
- Re: [dwz-multifile-rebase] conflict resolution; not pushed
  - From: Tom Tromey

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]