diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:47:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-29 17:47:57 -0400 |
| commit | 10539c83e072686fe9e5fe95010aa434cb553c44 (patch) | |
| tree | 754677fbe470e515b6268d13f000f3ff1d666466 /doc/devblog | |
| parent | e8d27f4c2f11b4c89808933615ec84c0b7ba9c45 (diff) | |
devblog
Diffstat (limited to 'doc/devblog')
| -rw-r--r-- | doc/devblog/day_352__had_to_be_done.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/devblog/day_352__had_to_be_done.mdwn b/doc/devblog/day_352__had_to_be_done.mdwn new file mode 100644 index 000000000..181fbd7e7 --- /dev/null +++ b/doc/devblog/day_352__had_to_be_done.mdwn @@ -0,0 +1,3 @@ +Automatic merge conflict resolver updated to work with unlocked files in v6 +repos. Fairly tricky and painful; thank goodness the test suite tests a lot +of edge cases in that code. |