Commits


eflag in diff3.c is hard-coded to 3; remove code for other cases


check for errors from fseek(3) in diff3.c's edscript()


check for errors from diff_output() in diff3.c


convert remaining functions in diff3.c to struct got_error


convert error handling in diff3.c's repos() to struct got_error


convert handling in diff3.c's merge() function to struct got_error


bump version number


changes for 0.17


Fix misleading wording in got.1 about branch options; -r option always works.


make 'got branch' without args show work tree's branch; requested by benno@


show temporary branch in 'got branch -l' during rebase and histedit


fix bogus error return introduced in previous commit


update reference list when 'tog log' view is refreshed with Ctrl+L


make 'got status' read .gitignore files; support **/ and /**/ in patterns


handle empty trees during 'import' and 'checkout'; spotted by sthen@