Dan Oconnor 811b484786 Fixed graph view not allowing you to iterate differences when there were no local or no remote changes ...

[CL 2350387 by Dan Oconnor in Main branch]

2014-11-05 14:04:10 -05:00

..

BlueprintMergeData.h

Conflict highlighting for the graph view in the merge tool

2014-10-27 19:34:03 -04:00

Merge.cpp

Moved Blueprint Merge tool toggle to experimental editor settings

2014-10-30 20:04:18 -04:00

MergePrivatePCH.h

#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge

2014-06-25 13:25:21 -04:00

SBlueprintMerge.cpp

Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference

2014-11-04 22:25:35 -05:00

SBlueprintMerge.h

Conflict highlighting for the graph view in the merge tool

2014-10-27 19:34:03 -04:00

SMergeDetailsView.cpp

Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference

2014-11-04 22:25:35 -05:00

SMergeDetailsView.h

Merge panel's details view can now highlight conflicts

2014-10-30 13:36:47 -04:00

SMergeGraphView.cpp

Fixed graph view not allowing you to iterate differences when there were no local or no remote changes

2014-11-05 14:04:10 -05:00

SMergeGraphView.h

Separated list for remote differences and local differences in the graph view for the merge tool

2014-10-28 13:43:26 -04:00

SMergeTreeView.cpp

Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference

2014-11-04 22:25:35 -05:00

SMergeTreeView.h

Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference

2014-11-04 22:25:35 -05:00