Re: [fossil-dev] Failing 3-way merge and merge2.test case

2016-09-28 Thread Ross Berteig
On 9/28/2016 3:55 PM, Ross Berteig wrote: For some time now, the test suite has been noting two errors from merge2.test: merge-utf-79-23 and merge-utf-79-32. As of[0661d65c]these are the only failing tests on trunk. And apparently while I was researching this, drh was busily anticipating my

Re: [fossil-dev] [PATCH] Markdown support in json view command

2016-09-28 Thread BohwaZ
The actual patch, as plaintext: Index: src/json_wiki.c == --- src/json_wiki.c +++ src/json_wiki.c @@ -110,19 +110,27 @@ json_julian_to_timestamp(pWiki->rDate)); if(0 == contentFormat){