Jakob Borg da4ebb6535 Determine conflict winner based on change type and modification time (fixes #1848)

2015-07-21 15:39:20 +02:00

..

github.com

Determine conflict winner based on change type and modification time (fixes #1848)

2015-07-21 15:39:20 +02:00

golang.org/x

Dependency update

2015-04-01 11:58:35 +02:00