diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-02-23 23:35:48 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-02-23 23:35:48 +0000 |
| commit | 47ce0f2a93ebe00c11c9951447693e922221be2e (patch) | |
| tree | 61a74fc02ad723dc8a83216d48a5c34784cabbb4 /phpBB/includes/diff/renderer.php | |
| parent | 2ec1d9238878fe3838f296e77cd05493e19e38ab (diff) | |
| download | forums-47ce0f2a93ebe00c11c9951447693e922221be2e.tar forums-47ce0f2a93ebe00c11c9951447693e922221be2e.tar.gz forums-47ce0f2a93ebe00c11c9951447693e922221be2e.tar.bz2 forums-47ce0f2a93ebe00c11c9951447693e922221be2e.tar.xz forums-47ce0f2a93ebe00c11c9951447693e922221be2e.zip | |
Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]
If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff/renderer.php')
0 files changed, 0 insertions, 0 deletions