diff contrib/tcsh_completion @ 27161:296d55def9c4

filemerge: add debug output for whether this is a change/delete conflict Just like binary and symlink conflicts, change/delete conflicts influence the tool picked.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:25:26 -0800
parents 2616325766e3
children
line wrap: on
line diff