GNOME Bugzilla – Bug 617097
New versions of Git shows unmerged files as "both modified"
Last modified: 2010-04-28 21:05:03 UTC
Newer versions of Git (checked with 1.7.0.4) shows merge-diff like this: $ git status # On branch connection-errors # Changes to be committed: # # modified: Session.java # new file: VkException.java # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: PersonForm.java # both modified: Request.java # Currently melds recognizes such files as "Non VC".
*** This bug has been marked as a duplicate of bug 617098 ***