comparison contrib/dockerdeb @ 27034:86ede9eda252

filemerge: return whether the file was deleted This is required for change/delete conflict resolution -- see previous patches for more details.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 14:22:52 -0800
parents 7f49efcaa9b4
children 7fbab10f812f
comparison
equal deleted inserted replaced
27033:089dab8794dc 27034:86ede9eda252