From: reagle <joseph.2008@reagle.org>
Date: Wed, 2 Feb 2011 22:05:15 +0000 (-0500)
Subject: pull and commit should be much more useful about conflicts
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/d49bb0b4917d905651356996988e7f82ead50101?ds=sidebyside;hp=d49bb0b4917d905651356996988e7f82ead50101

pull and commit should be much more useful about conflicts
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
---