commit - 9ba1d3087cee3f7ec5b1b1b8d64631993ac7841f
commit + 5da3196d83cddd8a3de428d0e844da0714ad4f86
blob - 51050c92f63a72e07375e3ed7ddbb1de4e1b0364
blob + c485bdc12a247f6108edc17394b8c730100673ac
--- CHANGES
+++ CHANGES
@@ -1,3 +1,20 @@
+* got 0.18; 2019-10-21
+- always show the input path when realpath(3) returns an error
+- preserve log message when an error occurs during commit, tag, or import
+- ignore empty files in refs directory instead of throwing errors
+- show file mode differences (executable bit) when diffing in-repository trees
+- fix handling of executable-bit changes during update, commit, and status
+- improve tog's responsiveness after loading hundreds of thousands of commits
+- fix tog performance bug which made searching through commits very slow
+- add 'got integrate' command for merging a branch back to its parent branch
+- show content from the merge-base file in 3-way merge conflicts, if available
+- improved indication of 3-way merge inputs in conflict marker labels
+- handle read errors in got_packidx_init_hdr (found by jj@ with scan-build)
+- remove worklist code; it was only used to unlink files already unlinked
+- show bad reference names in error messages to make such errors more clear
+- add -w (ignore whitespace) option to 'got diff'
+- improved coding style and error handling in diff3 code
+
 * got 0.17; 2019-10-06
 - make 'got branch' without args show work tree's branch (requested by benno)
 - show temporary branch in 'got branch -l' during rebase and histedit