dev changed hello.txt
master changed hello.txt
master restore hello.txt