diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 8562a0ca4..55799e651 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -66,6 +66,14 @@ function Files({ data,history,owner,projectsId , parentsSha }){
)
+ function subStrContent(content){
+ if(content){
+ return content.slice(1);
+ }else{
+ return "";
+ }
+ }
+
return(
{e.nativeEvent.stopImmediatePropagation()}}>
@@ -127,7 +135,10 @@ function Files({ data,history,owner,projectsId , parentsSha }){
{item.leftIdx && item.leftIdx !=="0" ? item.leftIdx :"" }
{item.rightIdx && item.rightIdx !=="0" ? item.rightIdx :"" }
- {item.content}
+
+ {item.type===2 ? "+" : item.type===3 ? "-" :""}
+ { (item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}
+
)
})
diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss
index c50c810cc..476cc0d29 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -112,4 +112,9 @@
.mergeBox{
margin:0px auto;
width: 1200px;
+}
+.linetype{
+ width:30px;
+ text-align: center;
+ display: inline-block;
}
\ No newline at end of file
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 1a3828872..a338c2909 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -193,7 +193,6 @@ form .ant-cascader-picker, form .ant-select {
width: 100px;
padding: 0px 8px;
box-sizing: border-box;
- margin-right: 8px;
}
.linesContent .lines > span:first-child{
margin-right: 0px;