Is it possible to have git automatize resolution of a certain kind of merge conflicts
===

We have two branches X and Y that have been branched at this point:

    test.txt
    dir/a.txt
    dir/b.txt

Now branch X introduces some changes into dir/a.txt and a commit is created. Branch Y makes a commit where dir/ gets deleted. 

Then we want to merge X into Y. This will create a certain kind of "deleted-changed" conflict. Is it possible to instruct git to always "use ours" when it detects this specific conflict for the specific branch (Y) and a specific set of files (dir/*) ?