Commit Briefs



Stefan Sperling

make 'got update' restore missing files





Stefan Sperling

skip make obj in cmdline test directory






Stefan Sperling

make 'got update' merge file edits



Stefan Sperling

diff3: make labels work and fix leaks


Stefan Sperling

initialize temp_files in got_merge_diff3()