merge overwrites unstaged changes in renamed file
[git/gitster.git] / perl / Git / 
treee7a08558de4e9e6d8c2d3acbde751c371de5ba5c
drwxr-xr-x   ..
-rw-r--r-- 1972 I18N.pm