From: Gustaf Hendeby <hendeby@isy.liu.se>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Fix AsciiDoc errors in merge documentation
Date: Fri, 05 Sep 2008 00:26:14 +0200 [thread overview]
Message-ID: <48C06086.7080405@isy.liu.se> (raw)
In-Reply-To: <200809042348.48570.johan@herland.net>
[-- Attachment #1: Type: text/plain, Size: 441 bytes --]
Johan Herland wrote:
> On Thursday 04 September 2008, Gustaf Hendeby wrote:
>> Trying to compile the documentation from next has failed for me for a
>> while and now I got to the point where I tracked down the offending
>> commit: 70a3f89733a (git-merge documentation: describe how conflict is
>> presented).
>
> This fixes the problem for me.
Nice, solves my problems too. Thanks!
Tested-by: Gustaf Hendeby <hendeby@isy.liu.se>
/Gustaf
[-- Attachment #2: hendeby.vcf --]
[-- Type: text/x-vcard, Size: 386 bytes --]
begin:vcard
fn:Gustaf Hendeby
n:Hendeby;Gustaf
org;quoted-printable:Link=C3=B6pings universitet;Department of Electrical Enginering
adr;quoted-printable:;;;Link=C3=B6ping;;SE-581 83;Sweden
email;internet:hendeby@isy.liu.se
title:Research Associate
tel;work:+46 14 28 22 26
tel;cell:+46 730 64 64 89
x-mozilla-html:FALSE
url:http://www.control.isy.liu.se/~hendeby
version:2.1
end:vcard
next prev parent reply other threads:[~2008-09-04 22:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-04 10:43 [BUG] Problem compiling documentation Gustaf Hendeby
2008-09-04 21:48 ` [PATCH] Fix AsciiDoc errors in merge documentation Johan Herland
2008-09-04 22:26 ` Gustaf Hendeby [this message]
2008-09-04 23:19 ` Junio C Hamano
2008-09-05 6:09 ` Johan Herland
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=48C06086.7080405@isy.liu.se \
--to=hendeby@isy.liu.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.