4 years ago e19660d59f Stefan Sperling
some whitespace fixes in diff3.c
4 years ago 346b301a61 Stefan Sperling
check for errors from buf_append() in diff3.c's diff_output()
4 years ago 950435fdd3 Stefan Sperling
remove pointless debug code from diff3.c
4 years ago 18b9ebab6e Stefan Sperling
eflag in diff3.c is hard-coded to 3; remove code for other cases
4 years ago e9dabdfbdb Stefan Sperling
check for errors from fseek(3) in diff3.c's edscript()
4 years ago ce09ab8d7c Stefan Sperling
check for errors from diff_output() in diff3.c
4 years ago 02b87977bd Stefan Sperling
convert remaining functions in diff3.c to struct got_error
4 years ago f571bb8516 Stefan Sperling
convert error handling in diff3.c's repos() to struct got_error
4 years ago 180dce26a8 Stefan Sperling
convert handling in diff3.c's merge() function to struct got_error
4 years ago 1b550f7ee3 Stefan Sperling
bump version number
4 years ago 1b450cf1f6 Stefan Sperling
changes for 0.17 (tags/0.17)
4 years ago ba6e0c2d73 Stefan Sperling
Fix misleading wording in got.1 about branch options; -r option always works.
4 years ago ad89fa3118 Stefan Sperling
make 'got branch' without args show work tree's branch; requested by benno@
4 years ago 4e99b47e58 Stefan Sperling
show temporary branch in 'got branch -l' during rebase and histedit
4 years ago 50284065f7 Stefan Sperling
fix bogus error return introduced in previous commit