fixed a name problem
This commit is contained in:
parent
7dc3d67b46
commit
1cdc6fb1cf
2 changed files with 2 additions and 2 deletions
|
@ -69,7 +69,7 @@ $ git pull
|
||||||
remote: Counting objects: 5, done.
|
remote: Counting objects: 5, done.
|
||||||
remote: Total 3 (delta 0), reused 0 (delta 0)
|
remote: Total 3 (delta 0), reused 0 (delta 0)
|
||||||
Unpacking objects: 100% (3/3), done.
|
Unpacking objects: 100% (3/3), done.
|
||||||
From /home/e640846/tmp/conflictTest
|
From /home/yogsototh/tmp/conflictTest
|
||||||
d3ea395..2dc7ffb master -> origin/master
|
d3ea395..2dc7ffb master -> origin/master
|
||||||
Auto-merging foo
|
Auto-merging foo
|
||||||
CONFLICT (content): Merge conflict in foo
|
CONFLICT (content): Merge conflict in foo
|
||||||
|
|
|
@ -66,7 +66,7 @@ $ git pull
|
||||||
remote: Counting objects: 5, done.
|
remote: Counting objects: 5, done.
|
||||||
remote: Total 3 (delta 0), reused 0 (delta 0)
|
remote: Total 3 (delta 0), reused 0 (delta 0)
|
||||||
Unpacking objects: 100% (3/3), done.
|
Unpacking objects: 100% (3/3), done.
|
||||||
From /home/e640846/tmp/conflictTest
|
From /home/yogsototh/tmp/conflictTest
|
||||||
d3ea395..2dc7ffb master -> origin/master
|
d3ea395..2dc7ffb master -> origin/master
|
||||||
Auto-merging foo
|
Auto-merging foo
|
||||||
CONFLICT (content): Merge conflict in foo
|
CONFLICT (content): Merge conflict in foo
|
||||||
|
|
Loading…
Reference in a new issue