Received: from spf5.us4.outblaze.com (spf5.us4.outblaze.com [205.158.62.27]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iALL0x4h006305 for ; Sun, 21 Nov 2004 21:01:00 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf5.us4.outblaze.com (Postfix) with ESMTP id 81B8B779BF for ; Sun, 21 Nov 2004 21:01:01 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CVyyQ-0001R8-D9 for migo@homemail.com; Sun, 21 Nov 2004 16:10:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CVyxv-0001Qm-NV for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 16:09:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CVyxv-0001QU-2c for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 16:09:47 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CVyxu-0001QK-VG for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 16:09:46 -0500 Received: from [144.140.71.14] (helo=gizmo04ps.bigpond.com) by monty-python.gnu.org with smtp (Exim 4.34) id 1CVynZ-0002IN-PI for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 15:59:06 -0500 Received: (qmail 14328 invoked from network); 21 Nov 2004 20:59:03 -0000 Received: from unknown (HELO psmam11.bigpond.com) (144.135.25.100) by gizmo04ps.bigpond.com with SMTP; 21 Nov 2004 20:59:03 -0000 Received: from cpe-144-132-221-212.nsw.bigpond.net.au ([144.132.221.212]) by psmam11.bigpond.com(MAM REL_3_4_2a 225/14121061) with SMTP id 14121061; Mon, 22 Nov 2004 06:59:03 +1000 Received: by poolcompsonline.com (Postfix, from userid 1000) id ABFD079641; Mon, 22 Nov 2004 08:01:59 +1100 From: Zenaan Harkness To: arch Content-Type: text/plain Content-Transfer-Encoding: 7bit Message-Id: <1101070919.6134.11.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Mon, 22 Nov 2004 08:01:59 +1100 Subject: [Gnu-arch-users] diff markers/ star merge X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 682 Lines: 22 Sorry to visit this again so soon, but I've been working for almost a month on a change and I want to merge, but I don't want to commit my change before I give it a solid review - which will take a good half day. So, I can tla undo, tla star-merge then tla redo, except when I tla redo I get the .rej conflict files rather than diff3 in-file markers. Is there a way to play with my branches to achieve this (get the diff3 in-file markers when I re-do)? tia zen _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/