[MERGE] show merge indicators in log --long

[Jelmer Vernooij]

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

Ian Clatworthy wrote:
> Also, if only one level is displayed and merges are found,
> the user is now advised how to see the nested merged
> revisions for --long and --short. (I decided against
> adding that advice in long --line mainly because that might
> break scripts parsing the output from there.)
I think you mean "log --line" :-)

>  
> +    def merge_marker(self, revision):
> +        """Get the merge marker to include in the output or '' if None."""
Shouldn't this be "none" rather than "None" (as you're not referring to
the Python object) ?

Other than that, seems good to me.

bb:tweak

Cheers,

Jelmer

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

iJwEAQECAAYFAknPlC8ACgkQDLQl4QYPZuU3dAP/SyfDy3sE8Te5alr6CK8aqqzY
teh1+1xFFKwxdAvg74W6p2cBhmnfVd+8juWY0ukaHskgJQqgXxJXvY1/yz2B6TM5
+bST2uer7leODKx9gGzs2b9wmuxTtxzunj7hign0TloaXFnQsrl1RA5+QOIuLqZF
nJcH693mssHuLuDQPz8=
=K4/3
-----END PGP SIGNATURE-----