NDGitUI descriptionDiff list windowConflict analysis windowLayout of the conflict analysis windowScreen layout of conflict analysis window The layout of the conflict analysis screen is as follows. Ribbon Difference tree Detailed view Status bar Dialog