Dave Abrahams

Yeah, I'll try to find it. I actually think this is something that happens with Git even with no imerge involved. On Tue, Sep 22, 2020 at 5:11 AM Michael...

Also, I pretty much always keep rerere disabled, because I often have to go back over a complicated merge and rerere just perpetuates my mistakes.

More particularly, I think I would want it to use `-s recursive -Xdiff-algorithm=histogram` by default. IIUC that's like `patience` only more-automatic.

It seems to me that you don't necessarily need to preserve 2 dependents for each manual merge (both downward and rightward), which is what this seems to propose. It's just...

I'm not sure this is really what's needed, because it seems like width or height specified in non-absolute units like '%' or 'em' *should* probably be limited by minima/maxima. I'm...

Here's an example of first-class layout support: https://sli.dev/guide/syntax.html#front-matter-layouts

I found a workaround, but it ain't pretty: ```js Reveal.addEventListener( 'menu-ready', () => { function homeOnClick(e) { if (e.nodeType == Node.ELEMENT_NODE) { e.setAttribute('onclick', 'location.href = "/";'); } } var b...

thanks!

There is a backward-compatibility issue I noticed when I dropped this change into my project: it now insists on `g` or `y` flags for the regex in a regex search.

I think this patch needs some documentation for `matchNodeIndex` (and anything else added). I don't know what it means and all the examples merely test it against zero, so it's...