Tree
- Tree:
abcd93b1a48710aa9576b8c53f5f9e2149594315
- 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-build-regress.sh* | commits | blame |
got-portable-ver.sh* | commits | blame |
uncompress-loose-object.sh* | commits | blame |