[MERGE] Allow external annotation tie breakers

[John Arbash Meinel]

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

Vincent Ladeuil wrote:
> We currently use alphabetical sort to break ties between
> annotations when line content is identical.
> 
> This is arbitrary but with a constraint which is to provide
> stability against further merges (otherwise we may flip-flop the
> attribution if criss-cross merges occur).
> 
> It happens that using the oldest revision better fits user
> expectations in most of the cases.
> 
> We can't (with the current design) easily determine which
> revision is the oldest.
> 
> Yet, this patch introduce a specific function that plugins can
> override until we provide a better solution.
> 
>          Vincent
> 
> 

BB:approve

John
=:->

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

iEYEARECAAYFAknbdxoACgkQJdeBCYSNAAOkvwCfbaaqcXBsMJxdEYNfqt9FA7qS
+MwAoKwFIAwnDwQTa0iATsH7/UzhSO5Z
=h1+u
-----END PGP SIGNATURE-----