File tree Expand file tree Collapse file tree 4 files changed +0
-85
lines changed
Expand file tree Collapse file tree 4 files changed +0
-85
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ You have unmerged paths.
3838
3939Unmerged paths:
4040 (use "git add/rm <file>..." as appropriate to mark resolution)
41-
4241 deleted by us: foo
4342
4443no changes added to commit (use "git add" and/or "git commit -a")
@@ -143,7 +142,6 @@ You have unmerged paths.
143142
144143Unmerged paths:
145144 (use "git add/rm <file>..." as appropriate to mark resolution)
146-
147145 both added: conflict.txt
148146 deleted by them: main.txt
149147
@@ -177,7 +175,6 @@ You have unmerged paths.
177175
178176Unmerged paths:
179177 (use "git add/rm <file>..." as appropriate to mark resolution)
180-
181178 both deleted: main.txt
182179 added by them: sub_master.txt
183180 added by us: sub_second.txt
@@ -201,12 +198,10 @@ You have unmerged paths.
201198 (use "git merge --abort" to abort the merge)
202199
203200Changes to be committed:
204-
205201 new file: sub_master.txt
206202
207203Unmerged paths:
208204 (use "git rm <file>..." to mark resolution)
209-
210205 both deleted: main.txt
211206
212207Untracked files not listed (use -u option to show untracked files)
You can’t perform that action at this time.
0 commit comments