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.
38
38
39
39
Unmerged paths:
40
40
(use "git add/rm <file>..." as appropriate to mark resolution)
41
-
42
41
deleted by us: foo
43
42
44
43
no changes added to commit (use "git add" and/or "git commit -a")
@@ -143,7 +142,6 @@ You have unmerged paths.
143
142
144
143
Unmerged paths:
145
144
(use "git add/rm <file>..." as appropriate to mark resolution)
146
-
147
145
both added: conflict.txt
148
146
deleted by them: main.txt
149
147
@@ -177,7 +175,6 @@ You have unmerged paths.
177
175
178
176
Unmerged paths:
179
177
(use "git add/rm <file>..." as appropriate to mark resolution)
180
-
181
178
both deleted: main.txt
182
179
added by them: sub_master.txt
183
180
added by us: sub_second.txt
@@ -201,12 +198,10 @@ You have unmerged paths.
201
198
(use "git merge --abort" to abort the merge)
202
199
203
200
Changes to be committed:
204
-
205
201
new file: sub_master.txt
206
202
207
203
Unmerged paths:
208
204
(use "git rm <file>..." to mark resolution)
209
-
210
205
both deleted: main.txt
211
206
212
207
Untracked files not listed (use -u option to show untracked files)
You can’t perform that action at this time.
0 commit comments