[MERGE REVIEW] merge_inner honours ignore_zero parameter

[Aaron Bentley]

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

Hi all,

merge_inner doesn't currently honour the ignore_zero parameter.  This is
a one-line fix, except for the test cases.  Calling _get_log feels
dirty-- I'd like to have a way to get the log output for a single
function, e.g.
  log = self.callLogged(merge_inner, branch, other_tree, base_tree,
                        this_tree=this_tree)

Unfortunately, enable_test_log/disable_test_log doesn't seem to stack.

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

iD8DBQFEDHb40F+nu1YWqI0RAvBIAJ9ljmg0EvJszaVPk1/AmkhWbgm0ngCfbQ74
xViPNo+BYvPdxEV9G/Q3VkY=
=26yJ
-----END PGP SIGNATURE-----