[MERGE] log --[line|short] FILE fix

[John Arbash Meinel]

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

Vincent Ladeuil wrote:
...

> 
> Can you do 'include_merges=generate_merge_revisions' instead ?
> 
> I saw John doing it consistently for optional parameters (I'm not
> saying other don't but I'm aware he does it), it helps handle
> compatibility.

I feel like it helps compatibility, but often it also helps for
readability. This is more the case when you have:

foo(True) versus foo(include_merges=True), as a variable of
"generate_merges" is mostly clear about what you are saying.

John
=:->

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

iEYEARECAAYFAklvbfkACgkQJdeBCYSNAAPkEQCbBv8UrC4tBX0PyXT4D5U+5mmF
7u4Amwe04QAN9/DqOMRP9E4eC/W1WfjF
=ILeb
-----END PGP SIGNATURE-----