Tree

Tree:
d637364619a58688bdcec02b0482889d63908ff5
Date:
Message:
make 'got merge -c' fail even if new changes only affect unrelated paths Otherwise, 'got merge -c' can silently revert already committed changes. Also fix GOT_ERR_MERGE_COMMIT_OUT_OF_DATE by giving it a value distinct from GOT_ERR_MERGE_STAGED_PATHS. Patch by James Cook
got_blame.hcommits | blame
got_cancel.hcommits | blame
got_commit_graph.hcommits | blame
got_date.hcommits | blame
got_dial.hcommits | blame
got_diff.hcommits | blame
got_error.hcommits | blame
got_fetch.hcommits | blame
got_gotconfig.hcommits | blame
got_object.hcommits | blame
got_opentemp.hcommits | blame
got_patch.hcommits | blame
got_path.hcommits | blame
got_privsep.hcommits | blame
got_reference.hcommits | blame
got_repository.hcommits | blame
got_repository_admin.hcommits | blame
got_send.hcommits | blame
got_serve.hcommits | blame
got_sigs.hcommits | blame
got_sockaddr.hcommits | blame
got_utf8.hcommits | blame
got_version.hcommits | blame
got_worktree.hcommits | blame