mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

devblog

Browse source
This commit is contained in:
Joey Hess 2015-12-29 17:47:57 -04:00
parent 7fd9fa3d72
commit f34c0b1319
Failed to extract signature
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/devblog/day_352__had_to_be_done.mdwn Normal file
View file

@ -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.