diff contrib/dockerrpm @ 27033:089dab8794dc

filemerge: return whether the file is deleted from all other merge tools This is required for change/delete conflicts -- see the previous patch for more information.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 13:55:31 -0800
parents 227b9b2a57a3
children 1292700d31b5
line wrap: on
line diff