[MERGE] Fix handling of specified files in LCA merge

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Hi all,
> 
> Due to a small oversight, LCA merge does not support merging single
> files.  This patch fixes it.
> 
> Aaron

BB:approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHzRCcJdeBCYSNAAMRAqzGAJ99j5ttM94+T0KCO3lyltSa1vg32gCdHsyA
BQq+lw+nm8DrCZz0OTUyF54=
=6BvU
-----END PGP SIGNATURE-----