Details
-
Bug
-
Status: Closed (View Workflow)
-
Resolution: Fixed
-
3.0.RC7
-
None
-
PHP Environment:
Database:
Description
If there are conflicts while updating and you view them, the markers are a little confusing:
<<<<<<< Current original file
|
...
|
...
|
======= End of current file / Begin of new updated file
|
...
|
...
|
>>>>>>> New updated file
|
I think the description should better be something like this:
<<<<<<< Begin of current original file
|
...
|
...
|
======= End of current original file / Begin of new updated file
|
...
|
...
|
>>>>>>> End of new updated file
|