summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test/.settings
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2012-04-14 00:40:06 +0200
committerChristian Halstrick <christian.halstrick@sap.com>2012-04-17 09:51:03 +0200
commit95ed300b04f52e6d0625dfb5a6e0e52aac4bc412 (patch)
tree8cce3f161218076b3fc0c567bb32aff88f96a9bf /org.eclipse.jgit.pgm.test/.settings
parentdd1e66e1d7f346f6e16e30c209497b436d00a69e (diff)
downloadjgit-95ed300b04f52e6d0625dfb5a6e0e52aac4bc412.tar.gz
jgit-95ed300b04f52e6d0625dfb5a6e0e52aac4bc412.zip
Enable DirCacheEntry's copyMetaData to not copy stage info
When there is a conflict sometimes we did not set the stage of the conflict entries properly for the STAGE_1 entry. Change-Id: I1c28ff6251fdbc95f7c40fc3e401f1b41157a9f6
Diffstat (limited to 'org.eclipse.jgit.pgm.test/.settings')
0 files changed, 0 insertions, 0 deletions