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@

memset all stack-allocated structs used to send messages; ok stsp@

zero the whole struct got_imsg_object before sending it otherwise some fields may be unitialized and fail the validation done on the receiving side. ok stsp@

bump version number

CHANGES for 0.71

fix a segfault in tog diff The f1 tempfile must always be created. Even if the initial diff has no objects on the left side, the view can be switched to a different diff which does have objects on both sides. When that happened, tog crashed. (To reproduce: open tog in got.git, hit G, hit Enter, hit <)

fix build of tog on sparc64 with -Werror error was tog/tog.c:636: warning: function declaration isn't a prototype

account for the vborder in draw_commit the vborder is drawn on top of the window and that can cause issues with double-width characters. Instead, account for it when computing the space available for the log message. ok stsp@

tog: resize main view drawing the child view on top of the main view when the layout is split-screen can produce some ugly glitches when double-width characters are involved. (issue found by stsp) ok stsp@

simplify scroll_wline (now span_wline) and format_line generalize scroll_wline to start at a specified offset so that we can reuse it to simplify format_line. While here, simplify scroll_wline (now called span_wline) too. ok and improvements by stsp@

fix wrong pointer in NULL check; found by tracey

fix highlighting issues in tog diff/blame search on lines with tabs

tog: fix crash in expand_tab while searching in diff/blame views found by op@ ok op@ tracey@

fix diff and blame view search for horizontal scrolling with unicode ok op@