First off, thanks for the new update today with lots of fixes for little annoyances. I appreciate the faster pace of releases. :-)
This could actually be considered two bugs: 1) When a conflicted item is selected, Local Changes is disabled. Since the versioned file is actually modified to include <<< / === / >>> markers to delimit changes in the later repo version and the local version, it would be nice to be able to view the changes. (I personally use `fmresolve` to resolve most commits with a 3-way diff/merge — see http://www.defraine.net/~brunod/fmdiff/ for details.) At the very least, diffing against the base version would be more helpful than nothing. 2) Once I've saved the merge to the original versioned file and resolved a conflict (clicking Resolved in the toolbar), the Local Changes button is still disabled. I would expect that it would be enabled if the merged version has uncommitted local modifications. Thanks, - Quinn
smime.p7s
Description: S/MIME cryptographic signature
