From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 17:52:19 +0200 Message-ID: <87vbfc1yz0.fsf@gmx.de> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> <87a8wo3fyk.fsf@gmx.de> <83382gybkc.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432828423 21788 80.91.229.3 (28 May 2015 15:53:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 15:53:43 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 17:53:35 2015 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 1Yy06v-000207-Kw for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 17:52:45 +0200 Original-Received: from localhost ([::1]:59680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy06v-0000Dc-6L for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:52:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy06o-0000BL-U5 for emacs-devel@gnu.org; Thu, 28 May 2015 11:52:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yy06g-0002hR-LG for emacs-devel@gnu.org; Thu, 28 May 2015 11:52:38 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:51691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy06Z-0002cX-3X; Thu, 28 May 2015 11:52:23 -0400 Original-Received: from detlef.gmx.de ([93.209.72.49]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0LrNE4-1Z84EK0hwq-0135V6; Thu, 28 May 2015 17:52:20 +0200 In-Reply-To: <83382gybkc.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 28 May 2015 18:19:15 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:xcMkDpOClA8wMHcJHPcLbFAZv1NC/NRkQxxg2slJubL53TEabE0 kXoKmU/xs0WpMc1WSV1Z+2WavgzjR9k4yTs0PJcdJuJ7fw+UJUaR9GWzG215OquF9aseElL lZUwN5HUC/D9KFnTuBIdoVqmZryo6fLHZEo4NAWOdth8XD18hhhPFltAJ7PoNQGFkQ0SAxb /ay9M7OoJ5tD5lzQfv7bw== X-UI-Out-Filterresults: notjunk:1;V01:K0:7HwlPGXK+e0=:cuzIZG6gXOPn5VKwxdWoqO QGE2yhlNfYctHpAPV58aSBppBc1g7BTpkfdPrn3JbapyTV6MTJziW27B+d2u7KV6/TcElBpIG eANlM3eMAQivnQQmxa+rKZG7U5xVYpsqzpIdFyrydgbGbzkUGliLhGbrtEGA0DvpJzKf8R2vG O8+jcO36EB6aB2GWs8vXifJCyOpsem3Sx6fsZZBs0nfO+UKnxq3rLh9YgU4/V4bcPwGn3xOn0 g5Wr53uD4CasBDAV70+UW8WbRfJUTA1zhKjQb1JukX0kgzwF3P5rKgRnBEtFlfJPn6S7sszmD EygFryHi6Rwz2sKKtSD8TmdITClyUEFHYi4wrKm5ZHw+WswNki8WqJynts+q8ZmqPlJJtyPw0 KYY5tv2Xk9eiidk68PWHHtknanbFGh/OSMkiyoeSEBYwXCI7cXI6FxLes3kYx4I7aR7qjAnC3 6raqnKotkQd+6P7luwHfahOI7H2cmfoCKLOvbAzh0Bzc2WABrr5X0ALf1mUipWjqKL1G1S8q8 ER1iWCJ1vnsDYgJtBe75UgAZt7eUiocrBcGbbq2W9KhyFpM5ya8wDTXHenRP9w6Adq7ii8D5c rKPt27sDWwtlj62EI6KmLt9qTE50QvQW8MnPlCvJdWJwsEwtPx8iDsJrBzZOlep9q4zLIFEg2 ZG/ZvvD3dajgLQDxcR3beo3il1cLT4u3h4Dk2tYaECK9VxcE1mTxLmH967Ndi3QUWjfw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.19 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:186917 Archived-At: Eli Zaretskii writes: > Btw, when you say you've committed tramp.el after resolving the > conflicts, what exactly did you do? Did you commit only that file, or > did you commit all the files that were ready to be committed? I've touched only tramp.el (and likely, I did something like "git reset lisp/net/tramp.el" first). The other files I've simply reverted in Emacs' vc-dir buffer, via "C-x v u", IIRC. Best regards, Michael.