One easy way is with git difftool - e.g. if you like vimdiff, then:

```
git difftool --tool=vimdiff master -- xapian-core/include/xapian/enquire.h
```

And edit this line in the local copy to make it match the version on master.