branching: overwrite broken merge with a correct one
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 13 Feb 2019 12:46:57 +0100
changeset 4402 cdc095c32e01
parent 4401 4baf81dd2193 (current diff)
parent 4400 9a6cebfb596b (diff)
child 4403 8b3172c8f753
branching: overwrite broken merge with a correct one Thanks goes to Anton Shestakov for spotting and fixing this.