wfMerge() now works if $wgDiff3 contains spaces
authorbtongminh <bryan.tongminh@gmail.com>
Sat, 29 Dec 2012 20:39:54 +0000 (21:39 +0100)
committerbtongminh <bryan.tongminh@gmail.com>
Sat, 29 Dec 2012 20:39:54 +0000 (21:39 +0100)
commit4f23290816fe41acff23c2b7c46f3b0706c000b9
treeb2c93a8b41ccb846e52edec1864904f7a9150ee5
parentc264a6f4c03fe8009941248201a7bde2bc44b757
wfMerge() now works if $wgDiff3 contains spaces

Change-Id: Ia18012ee87fe45e292cf08542f5b0680d0b85371
RELEASE-NOTES-1.21
includes/GlobalFunctions.php