inline struct got_object_id in struct got_object_qid Saves us from doing a malloc/free call for every item on the list. ok op@

wrap overlong lines

add "e" (close-on-exec) flag to fopen(3) calls suggested by millert ok thomas_adam

preverse binary files during updates and merges

set oldo.to in diff3.c's duplicate() even if the file contains no newlines

always initialize output parameter "n" of get_line() in diff3.c

fix another segfault in edscript() Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1. ok stsp

fix a segfault in edscript() introduced by my previous commit Found by our cherrypick regression tests.

fix merging of files which contain a dot on a line by itself Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert

indentation fixes

use Patience diff for merging during cherrypick/backout/histedit/rebase This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.

make merge_file() accept FILEs instead of paths for orig and deriv inputs

fix 3-way merge of files which lack a final \n problem found by jrick ok millert

use Myers diff instead of Patience diff when merging files with diff3 Myers diff tends to divide files into smaller diff chunks, while Patience diff attemps to maximize the size of diff chunks. Smaller diffs chunks generally result in a more managable presentation of merge conflicts.

make fclose(3) failure checks consistent; check 'fclose() == EOF' everywhere ok millert, naddy