We want to check if *nlines is greater than zero here. ok op@ and stsp@

Add () and {} key maps to navigate to the previous and next file or hunk in the diff. This required changing Got's diff API to collect line type metadata in addition to the line offsets already produced as prompted by stsp. ok stsp@

Now that the handling of including sys/queue.h is better, there's no need to remove those lines from the source. Copy the location of those original sys/queue.h lines from upstream at the same line number, so as to avoid any conflicts in the future.

Make the choice of diff algorithm configurable by diff API users. The got and gotweb programs keep using Patience diffs which are prettier than Myers. But tog should be as fast as possible since it is being used interactively. If performance of Patience diff gets improved later we can consider switching tog back over to it. ok tracey jamsek

ok tracey

ok tracey

Throwing this into the mix for a while, we can always get rid of it again if it becomes annoying. No objections from stsp@

The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@

suggested by + ok op@

ok tracey

reported by and fix confirmed by naddy

Need for filtering by path sugggested by kn@ ok naddy@

This adds the capability to compile got-portable on FreeBSD.

This commit modifies the GoT main branch to be able to compile it under linux.

ok millert, naddy

Fixes a problem in 'tog diff' where the first line of the output was cut off.