Re: [PATCH] Fix AsciiDoc errors in merge documentation
- From
Gustaf Hendeby <hendeby@isy.liu.se>
- Date
- Sep 4, 2008, 22:26 UTC
- Message-ID
- <48C06086.7080405@isy.liu.se>
- In-Reply-To
- <200809042348.48570.johan@herland.net>
Johan Herland wrote:
Show 7 quoted lines
> 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
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