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
Makefile | commits | blame |
Makefile.inc | commits | blame |
cmdline/ | |
delta/ | |
deltify/ | |
fetch/ | |
gotd/ | |
idset/ | |
path/ | |
template/ | |
tog/ |