[git] Merge a single file