Public bug reported:
Using Ubuntu 11.04 and Meld 1.5.0-0ubuntu1, I did an "svn up" on my
working code and got a conflict on one file. When I run "meld ." the
conflicting file shows in Meld's file list, but when I click through to
examine the conflict, I get a diff between the unmodified file and the
svn markup with "<<<<<< .mine" etc included.
Screenshots on the Meld website suggest that 3-way diff might be a yet-
to-be-completed feature, but I'm not sure about that.
** Affects: meld (Ubuntu)
Importance: Undecided
Status: New
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/820385
Title:
Meld doesn't display subversion "conflicts" correctly
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/meld/+bug/820385/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
