diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-17 14:18:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-17 14:18:57 +0000 |
| commit | d1f796bf255ea92aad1070293cf41a892a8245bf (patch) | |
| tree | 7d15343f1177788b9c32e2973b4d99271525893c /phpBB/includes/diff/engine.php | |
| parent | 13e8898563365d93525f08e1b4103c94b2114d48 (diff) | |
| download | forums-d1f796bf255ea92aad1070293cf41a892a8245bf.tar forums-d1f796bf255ea92aad1070293cf41a892a8245bf.tar.gz forums-d1f796bf255ea92aad1070293cf41a892a8245bf.tar.bz2 forums-d1f796bf255ea92aad1070293cf41a892a8245bf.tar.xz forums-d1f796bf255ea92aad1070293cf41a892a8245bf.zip | |
phpBB updater now solves common conflicts on it's own. This further reduces the chance of conflicts.
(tested with some heavily modified files who previously generated a lot of conflicts)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10160 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/diff/engine.php')
0 files changed, 0 insertions, 0 deletions