Git
Call it off
You tried to mergetr and hit a conflict. You will not deal with it now: call the merge off, so that everything is as it was before.- No conflict markers are left
- No merge is in progress
- The working tree is clean
The reference takes 1 command: finish in that many, without hints, for three stars.
Files