[#719] Made the Git merge placeholder more unique (seven hashes could…

… be used in some post quite easily)

plugins/versionpress/src/Git/merge-drivers/ini-merge.php

@@ -44,16 +44,16 @@
 
 }
 // Add temporary placeholder between adjacent lines to prevent merge conflicts
-file_put_contents($B, preg_replace('/(\r\n|\r|\n)/', "$1#######\n", $bFile));
-file_put_contents($A, preg_replace('/(\r\n|\r|\n)/', "$1#######\n", $aFile));
-file_put_contents($O, preg_replace('/(\r\n|\r|\n)/', "$1#######\n", $oFile));
+file_put_contents($B, preg_replace('/(\r\n|\r|\n)/', "$1###VP###\n", $bFile));
+file_put_contents($A, preg_replace('/(\r\n|\r|\n)/', "$1###VP###\n", $aFile));
+file_put_contents($O, preg_replace('/(\r\n|\r|\n)/', "$1###VP###\n", $oFile));
 
 // Call git merge command and receive the exitcode
 exec($mergeCommand, $dummy, $mergeExitCode);
 
 // Remove temporary placeholders
-file_put_contents($B, str_replace("#######\n", '', file_get_contents($B)));
-file_put_contents($A, str_replace("#######\n", '', file_get_contents($A)));
-file_put_contents($O, str_replace("#######\n", '', file_get_contents($O)));
+file_put_contents($B, str_replace("###VP###\n", '', file_get_contents($B)));
+file_put_contents($A, str_replace("###VP###\n", '', file_get_contents($A)));
+file_put_contents($O, str_replace("###VP###\n", '', file_get_contents($O)));
 
 exit ($mergeExitCode);

plugins/versionpress/src/Git/merge-drivers/ini-merge.sh

@@ -39,9 +39,9 @@ do
 done
 
 # Place temporary placeholder between lines to avoid merge conflicts on adjacent lines
-sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\n/&#######&/g' $O
-sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\n/&#######&/g' $A
-sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\n/&#######&/g' $B
+sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\n/&###VP###&/g' $O
+sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\n/&###VP###&/g' $A
+sed -i '' -e ':a' -e 'N' -e '$!ba' -e 's/\n/&###VP###&/g' $B
 
 # Process everything else through standard
 git merge-file -L mine -L base -L theirs $A $O $B
@@ -50,9 +50,9 @@ git merge-file -L mine -L base -L theirs $A $O $B
 GIT_MERGE_EXIT_CODE=$?
 
 # Remove temporary placeholders
-sed -e ':a' -e 'N' -e '$!ba' -e 's/\n#######//g' -i '' $A
-sed -e ':a' -e 'N' -e '$!ba' -e 's/\n#######//g' -i '' $B
-sed -e ':a' -e 'N' -e '$!ba' -e 's/\n#######//g' -i '' $O
+sed -e ':a' -e 'N' -e '$!ba' -e 's/\n###VP###//g' -i '' $A
+sed -e ':a' -e 'N' -e '$!ba' -e 's/\n###VP###//g' -i '' $B
+sed -e ':a' -e 'N' -e '$!ba' -e 's/\n###VP###//g' -i '' $O
 
 # If Git merge fails, we should also 'fail'
 if [ $GIT_MERGE_EXIT_CODE -ne 0 ]; then