diff contrib/docker/centos6 @ 26514:d5d8cd0e0d58

filemerge: call precheck if available In upcoming patches we'll define a precheck function for some merge tools.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 06 Oct 2015 22:55:21 -0700
parents 49ea49823769
children af09413deb72
line wrap: on
line diff