pijul_org / pijul

#115 Resolve conflict markers

Opened by laumann, on June 3, 2017
laumann commented on June 3, 2017

I was kinda blocked on these, so I figured I'd try and fix them

lthms commented on June 5, 2017

I’ve pushed a similar patch for graph.rs but I think we should merge yours, as it tackles and solves more.

pijul_org commented on June 6, 2017