git merge is a liar.

Mon, 27 Feb 2017 07:52:02 UTC