* src/merge.c (compute_changes): The TOO_EXPENSIVE heuristic in diffseq has
been removed, including compareseq's find_minimal parameter and the context's
too_expensive limit.  Adjust.

Run "make update-copyright".

* bootstrap.conf (gnulib_modules): Add update-copyright.
Run "make update-copyright".

* Globally rename type LINENUM to lin (as in diffutils).

* diffseq: Use the gnulib version instead of a private copy.

* src/merge.c: When a hunk has fewer suffix than prefix context lines,
try matching to the end of the file instead of doing a "greedy match":
this allows to detect already-applied inserts at the end of the file.
* tests/merge: Add test cases for this.

* src/bestmatch.h, src/diffseq.h, src/inp.c, src/maketime.c,
src/merge.c, src/partime.c, src/pch.c, src/util.c: No longer use
"continue" as the only instruction in a loop body: at least one
compiler chokes on this in combination with variable-length arrays
as in src/bestmatch.h.

src/maketime.c, src/maketime.h, src/merge.c, src/partime.c,
src/partime.h, src/patch.c, src/pch.c, src/pch.h, src/quotesys.c,
src/util.c, src/util.h, src/version.c: Add year 2010 to copyright
notice.  Replace the GPLv2 license template with the GPLv3 license
template.

to the --merge option to choose the output formats for conflicts.
* patch.man: Document the new optional argument of --merge.
* src/merge.c (merge_hunk): Implement diff3-style conflicts.
* src/common.h (conflict_style): This global variable determines the
output format for conflicts.
* tests/merge: Add test cases for the diff3 output format.