Local changes to foo.txt
Merged changes