mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

typo

Browse source
This commit is contained in:
Joey Hess 2012-06-27 16:19:23 -04:00
parent e365b8300d
commit 70329dc980
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/design/assistant/blog/day_18__merging.mdwn
View file

@ -51,9 +51,9 @@ code, and make `git annex sync` use it. Here's how it looks:
nothing to commit (working directory clean) nothing to commit (working directory clean)
ok ok
merge synced/master merge synced/master
CONFLICT (modify/delete): passwd deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of passwd left in tree. CONFLICT (modify/delete): bar.png deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of bar.png left in tree.
Automatic merge failed; fix conflicts and then commit the result. Automatic merge failed; fix conflicts and then commit the result.
passwd: needs merge bar.png: needs merge
(Recording state in git...) (Recording state in git...)
[master 0354a67] git-annex automatic merge conflict fix [master 0354a67] git-annex automatic merge conflict fix
ok ok