From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sun, 23 Nov 2014 05:35:55 +0200 Message-ID: <83fvdasi5g.fsf@gnu.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <871tp4xx4i.fsf@engster.org> <87tx20whtq.fsf@engster.org> <87lhn4rx0v.fsf@engster.org> <838uj3tztm.fsf@gnu.org> <87egsvrz6e.fsf@engster.org> <83mw7jrxt9.fsf@gnu.org> <87a93jrw83.fsf@engster.org> <83ioi7rn9o.fsf@gnu.org> <87389brle1.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416713771 27410 80.91.229.3 (23 Nov 2014 03:36:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Nov 2014 03:36:11 +0000 (UTC) Cc: esr@thyrsus.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 23 04:36:03 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XsNxz-0003rU-68 for ged-emacs-devel@m.gmane.org; Sun, 23 Nov 2014 04:36:03 +0100 Original-Received: from localhost ([::1]:47563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsNxy-00078Y-Mn for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 22:36:02 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsNxr-00078P-5p for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:35:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsNxm-00017R-GH for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:35:55 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:35606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsNxm-000151-80 for emacs-devel@gnu.org; Sat, 22 Nov 2014 22:35:50 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NFH00I0038QTO00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sun, 23 Nov 2014 05:35:48 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFH00IFK3BOKI60@a-mtaout22.012.net.il>; Sun, 23 Nov 2014 05:35:48 +0200 (IST) In-reply-to: <87389brle1.fsf@engster.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178056 Archived-At: > From: David Engster > Cc: monnier@iro.umontreal.ca, esr@thyrsus.com, emacs-devel@gnu.org > Date: Sat, 22 Nov 2014 22:11:18 +0100 > > At the moment, gitmerge will ask you what branch to merge with a > completing-read, where you can choose from a list of all local and > remote branches (they can optionally be filtered through a regexp). The > branch 'origin/emacs-24' is now set as INITIAL-INPUT, since this will be > the main purpose of gitmerge (for now). Are you OK with that? Yes, thanks.