t / t4100 / t-apply-8.expecton commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1 t/t4100-apply-stat.sh |    2 +-
   2 1 files changed, 1 insertions(+), 1 deletions(-)