tog: make SPACE page down in all views ok op@, Mark Jamsek

fix fullscreen view regression introduced in 0dbbbe90fd When cycling from a child view in fullscreen, the parent view is opened in a splitscreen with no border instead of fullscreen. Check the view mode when cycling between views and resize parent dimensions accordingly. ok op@

alias C-b/C-f to scroll page back/forward with b/f Suggested by naddy. Remap 'f'ullscreen to 'F', and blame view key maps 'b' and 'B' to 'c' and 'C', respectively, per stsp's and naddy's suggestion. While here, remove trailing whitespace. ok naddy@

use the commitid in the patch diff3 conflict header suggested by and ok stsp@

got patch: use diff3 to merge the changes Parse the "blob -" metadata in diffs produced by 'got diff' and use the original file for patching. Then, use the diff3 with the current version of the file to merge the differences. This solves many failures automagically or at least turns them into a conflict. ok/improvements stsp@

patch_file: fill tmp with the patched file even in nop mode future work with diff3 merge will need the fully patched file even in the nop mode ok stsp@

patch_file: move file ownership to parent ok stsp@

bump version number

CHANGES for 0.72

small grammar and accuracy fixes in a comment

add missing braces around multi-line if-statement body; pointed out by op@

take tog selection cursor position into account when searching for next match Patch by Mikhail ok op@ jamsek

wrap an overlong line in enumeration_request()

fix unexpected imsg error after incomplete enumeration in got-read-pack reported by jrick and op@ ok op@

tog: reset matched and search data after C-l otherwise they point to free'd data. ok stsp@