From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Engster Subject: Re: advice needed: how do you guys sync org files between devices? Date: Tue, 02 Jul 2013 18:11:14 +0200 Message-ID: <87txkd3pst.fsf@engster.org> References: <20130702101723.GA26752@kuru.dyndns-at-home.com> <87y59p3qc7.fsf@engster.org> <20130702160853.GG26752@kuru.dyndns-at-home.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uu3Ak-0000P5-8j for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:11:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uu3Ai-0006oW-Ut for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:11:18 -0400 Received: from randomsample.de ([83.169.19.17]:43461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uu3Ai-0006oL-IX for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 12:11:16 -0400 In-Reply-To: <20130702160853.GG26752@kuru.dyndns-at-home.com> (Suvayu Ali's message of "Tue, 2 Jul 2013 18:08:53 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Suvayu Ali Cc: emacs-orgmode@gnu.org Suvayu Ali writes: > That said, I think you might be right. Possibly it could be resolved by > just changing the algorithm, I don't know why I never tried that though. You might want to try setting diff.algorithm to 'patience' and maybe also raise diff.context to something like 6 or so if that doesn't solve your problem. It very much depends on how your Org files look. -David