public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Larsen <larsen007@web.de>
To: development@lists.ipfire.org
Subject: Re: [PATCH] ipsec.conf: Include ipsec.user.conf and ipsec.user-post.conf
Date: Thu, 04 Jun 2015 17:59:18 +0200	[thread overview]
Message-ID: <op.xzpqo4lecahio0@atl-uetersen.atlantisgmbh.local> (raw)
In-Reply-To: <1433433207.25208.6.camel@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

On Thu, 04 Jun 2015 17:53:27 +0200, Michael Tremer  
<michael.tremer(a)ipfire.org> wrote:

> thank you for sending this in. The patch looks good and I merged it
> already as it is a pretty simple one.

thx!


> However I had again trouble applying it right away. I do not really know
> why. It must some sort of whitespace error because the patch applies
> with patch --ignore-whitespace. So this wasn't a one-time error with the
> last patch.

For testing purposes, could you please create a patch file from what you  
have just merged so I can compare your patch with the file that  
Tortoisegit created for me?


Lars

  reply	other threads:[~2015-06-04 15:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-03 22:58 Larsen
2015-06-04 15:53 ` Michael Tremer
2015-06-04 15:59   ` Larsen [this message]
2015-06-04 16:02     ` Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=op.xzpqo4lecahio0@atl-uetersen.atlantisgmbh.local \
    --to=larsen007@web.de \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox