search

dellsystem / wikinotes

A free and open source resource for the courses at McGill University.
https://wikinotes.ca
GNU General Public License v3.0
47 stars 14 forks source link

added document editing conflict resolution #136

Closed hc5 closed 12 years ago

hc5 commented 12 years ago

wiki/utils/_patiencediff_py.py wiki/utils/merge3.py wiki/utils/patiencediff.py

are taken from http://code.google.com/p/django-pad/source/browse/trunk/wiki/, licenced under GPL.

dellsystem commented 12 years ago

why is it not actually committing anything for me

dellsystem commented 12 years ago

Other than the inexplicable gitutils.py changes it's good, but I'll have to merge it in manually. Thanks