projects / mw / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: d49bb0b)
pull and commit should be much more useful about conflicts
authorreagle <joseph.2008@reagle.org>
Wed, 2 Feb 2011 22:05:15 +0000 (17:05 -0500)
committerreagle <joseph.2008@reagle.org>
Wed, 2 Feb 2011 22:05:15 +0000 (17:05 -0500)
may have some bugs, but worked a few times so far
also note ordering question on line 189 demarcated by XXX
trying to sort out file v. filename which had an inconsistency; now have full_filename


No differences found
VCS-like nonsense for MediaWiki websites

Benjamin Mako Hill || Want to submit a patch?