[MERGE] Merge types are provided by a registry

[Aaron Bentley]

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

John Arbash Meinel wrote:
> I know we disagree on this, but I honestly do prefer
> '--merge-type=diff3' to '--diff3'.

> As someone else mentioned, doing '--merge-type=unknown' would give an
> unknown format, rather than an unknown argument.

Well, you get to pick either invocation :-)

> I do realize that --diff3 is shorter.

For me, it's several things:
- - ease of typing
- - better integration of registered values
- - useful help

The help for --diff3 gives you an idea of what to do.  The help for
'--merge-type' is not as useful.  There's not really room enough in
there to describe the various values and their pros and cons.  Better to
enumerate them, I think.

> But I think it is proliferating
> options, and has the potential to cause conflicts (I realize it is
> unlikely, but it is sort of like using namespaces to keep things distinct).

I think the namespacing of doing it per-command is enough.  I don't
think we add options frequently enough that such a problem would escape
notice for very long.  When you consider all the different meanings
'--force' could have for commit or merge, we seem to have done a good
job of avoiding those issues.

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

iD8DBQFFyipa0F+nu1YWqI0RAtcXAJ9ydCroNLmqHNaGlRqHD3RWZUaKDQCfUqa7
1kuDfiCJbMVAcGdUZYhFyeg=
=Cqxj
-----END PGP SIGNATURE-----