chiark / gitweb /
Merge branch 'cvsimport'
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 20 Feb 2015 15:14:17 +0000 (15:14 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 20 Feb 2015 15:14:52 +0000 (15:14 +0000)
commitd3a389bb8820859175314ef2f329d863d31d2b3f
tree389548d13b7b58f6e2855c5e880a4a02e09ca824
parent1069689de5ddf9ea55402544ad031cf7db85eb37
parent9da989a052244c034708d04a7c073d686fdd7043
Merge branch 'cvsimport'

Use -s ours, as source from woking is strictly newer.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>