rename_from_branch

renamed test.txt to test_filename_edited_from_master.txt, shows 2
changes to commit 1)delete, 2)new;
probably just rename not copy into new and delete old file, assuming
diff is calculated on contents not on container title