tigefa4u projects Trac

tigefa4u projects

• Summary
• Files
• Reviews
• Support
• Git ▾
  • Gitlab
  • Notepad++ Plugin Manager - Code
  • MyBB
  • JAMWiki - Code
• SVN ▾
  • Trac
  • Ruby

Menu ▾ ▴

 

• Browse Commits
• Browse Files

Commit [r5856]  Maximize  Restore  History

Add the possibility to perform a manual merge after a Wiki edit collision has been deleted. Fixes #152.

Authored by: cboos 2007-07-20

Browse code at this revision

Parent: [r5855]

Child: [r5857]

changed	/trunk/trac/wiki/templates/wiki_edit.html
changed	/trunk/trac/wiki/web_ui.py

/trunk/trac/wiki/templates/wiki_edit.html Diff Switch to side-by-side view

/trunk/trac/wiki/web_ui.py Diff Switch to side-by-side view