chiark / gitweb /
~ianmdlvl / sympathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1069689 9da989a)
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)
Use -s ours, as source from woking is strictly newer.

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.