t / t4100 / t-apply-9.expecton commit merge-recursive: rename conflict_rename_*() family of functions (8ebe7b0)
   1 t/t4100-apply-stat.sh |    2 +-
   2 1 file changed, 1 insertion(+), 1 deletion(-)