| throstur | is there a "lazy resolve conflicts" command? for some really weird reason everything is conflicted and I just want to "revert all conflicted files" | 13:30 |
|---|---|---|
| LeoNerd | What do you mean "lazy"? | 15:08 |
| throstur | I ended up just using sed on bzr status and doing it that way | 15:58 |
| throstur | took a lot longer than it could have but it worked | 15:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!