Be more user-friendly when refusing to do something because of conflict.
[git] / t / t4100 / t-apply-9.expect
1  t/t4100-apply-stat.sh |    2 +-
2  1 files changed, 1 insertions(+), 1 deletions(-)