[PATCH 2 of 6 V5] merge: add labels parameter from merge.update to filemerge

[Pierre-Yves David]

On 05/16/2014 04:48 PM, Durham Goode wrote:
> @@ -287,7 +287,8 @@
>           f = self._repo.opener("merge/" + hash)
>           self._repo.wwrite(dfile, f.read(), flags)
>           f.close()
> -        r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)
> +        r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca,
> +            labels=labels)

Wrong indentation. I fixed it.

>           if r is None:
>               # no real conflict
>               del self._state[dfile]


-- 
Pierre-Yves David