dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
88d72e0
)
Fixed problem with merging of identical changes
author
Mr. E23
<e23@users.mediawiki.org>
Sun, 14 Mar 2004 21:34:03 +0000
(21:34 +0000)
committer
Mr. E23
<e23@users.mediawiki.org>
Sun, 14 Mar 2004 21:34:03 +0000
(21:34 +0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
8133b75
..
ac00d4b
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-879,7
+879,7
@@
function wfMerge( $old, $mine, $yours, &$result ){
$conflict = false;
}
pclose( $handle );
- $cmd = "{$wgDiff3} -a --merge $mytextName $oldtextName $yourtextName";
+ $cmd = "{$wgDiff3} -a -
e -
-merge $mytextName $oldtextName $yourtextName";
$handle = popen( $cmd, "r" );
$result = "";
do {