Tree
Tree:
d637364619a58688bdcec02b0482889d63908ff5
Date:
Mon Jun 5 08:14:56 2023
UTC
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
Omar Polo