Make branch merging aware of underlying case-insensitive filsystems