merge overwrites unstaged changes in renamed file

[git.git] / t / t4100 / t-apply-9.expect

 t/t4100-apply-stat.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)