Commit Briefs

Stefan Sperling

properly deal with "$?" in cmdline tests; fixes spurious test "ok"

diff | patch | tree

Stefan Sperling

don't update cached timestamps of already modified files

diff | patch | tree

Stefan Sperling

clear executable bit when updating files if necessary

diff | patch | tree

Stefan Sperling

skip make obj in cmdline test directory

diff | patch | tree

Stefan Sperling

preserve executable bit on files during checkout and update

diff | patch | tree

Stefan Sperling

do not forget about regress tests during 'make obj'

diff | patch | tree

Stefan Sperling

fix typo in status code name: GOT_STATUS_MODIFIY -> GOT_STATUS_MODIFY

diff | patch | tree

Stefan Sperling

document status codes displayed by 'got update'

diff | patch | tree

Stefan Sperling

make 'got update' merge file edits

diff | patch | tree

Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

Stefan Sperling

initialize temp_files in got_merge_diff3()

diff | patch | tree

Stefan Sperling

make readin() actually write to its output argument

diff | patch | tree

Stefan Sperling

get rid of an unused global in diff3 code

diff | patch | tree

Stefan Sperling

get rid of another global in diff3 code (diff output buffer)

diff | patch | tree