After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 617097 - New versions of Git shows unmerged files as "both modified"
New versions of Git shows unmerged files as "both modified"
Status: RESOLVED DUPLICATE of bug 617098
Product: meld
Classification: Other
Component: dirdiff
1.3.x
Other Linux
: Normal normal
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2010-04-28 16:53 UTC by Семён Марьясин
Modified: 2010-04-28 21:05 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Семён Марьясин 2010-04-28 16:53:31 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".
Comment 1 Kai Willadsen 2010-04-28 21:05:03 UTC 

*** This bug has been marked as a duplicate of bug 617098 ***