Viewing changes to deleted files in git

Let's say that when I branch off from master, there's a file colors.txt on the master branch of my repo with these contents:

red
green
blue
yellow

I then branch off into my-branch, in which I make the following changes:

1. Delete colors.txt

2. Add red.txt with these contents:

   red
   

3. Add green.txt with these contents:

   green
   

4. Add blue.txt with these contents:

   blue
   

5. Add yellow.txt with these contents:

   yellow
   

Now, there have been some changes on master that I need, so I want to merge. However, someone has also changed colors.txt to:

red
green
blue
yellow
orange
purple

During my merge, the only information I get is that I deleted the file colors.txt, so how can I see the changes that have been to the file on master so I can appropriately resolve the conflict (in this case, by adding the files orange.txt and purple.txt)?