Commit Briefs

e19660d59f Stefan Sperling

some whitespace fixes in diff3.c

diff | patch | tree

346b301a61 Stefan Sperling

check for errors from buf_append() in diff3.c's diff_output()

diff | patch | tree

950435fdd3 Stefan Sperling

remove pointless debug code from diff3.c

diff | patch | tree

18b9ebab6e Stefan Sperling

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

diff | patch | tree

e9dabdfbdb Stefan Sperling

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

diff | patch | tree

ce09ab8d7c Stefan Sperling

check for errors from diff_output() in diff3.c

diff | patch | tree

02b87977bd Stefan Sperling

convert remaining functions in diff3.c to struct got_error

diff | patch | tree

f571bb8516 Stefan Sperling

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

diff | patch | tree

180dce26a8 Stefan Sperling

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

diff | patch | tree

1b550f7ee3 Stefan Sperling

bump version number

diff | patch | tree

1b450cf1f6 Stefan Sperling

changes for 0.17 (tags/0.17)

diff | patch | tree

ba6e0c2d73 Stefan Sperling

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

diff | patch | tree

ad89fa3118 Stefan Sperling

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

diff | patch | tree

4e99b47e58 Stefan Sperling

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

diff | patch | tree

50284065f7 Stefan Sperling

fix bogus error return introduced in previous commit

diff | patch | tree