implement 'got merge -n' which interrupts before creating a merge commit
commitba34626bc13877c93836c8ee873acf1be8429ead
authorStefan Sperling <stsp@stsp.name>
Sun, 26 Sep 2021 17:51:38 +0000 (26 17:51 +0000)
committerThomas Adam <thomas@xteddy.org>
Mon, 27 Sep 2021 18:32:16 +0000 (27 19:32 +0100)
tree5b9cd5bb4d3f76fcdadc320cb64ce8a6386b0c12
parent768705e331a0ff020ecc806142aecdecdbfb2e89
implement 'got merge -n' which interrupts before creating a merge commit
got/got.1
got/got.c
regress/cmdline/merge.sh