Merge pull request #16340 from jitendrapurohit/dev-1540
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 21 Jan 2020 05:13:43 +0000 (18:13 +1300)
committerGitHub <noreply@github.com>
Tue, 21 Jan 2020 05:13:43 +0000 (18:13 +1300)
commitea51d0c55be28b4c74d4658797b2799b03538ee5
tree6f6057e4297bcfe74351fcc412869b05fb1c27ca
parent71182a5697f32276e068675bfb6fff46e9b4ce1c
parenteef25687e5f7c7e201309a740454ca55e629bd74
Merge pull request #16340 from jitendrapurohit/dev-1540

Add user friendly error message on merge error