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

Added a comment

Browse source
This commit is contained in:
Horus 2016-05-05 10:01:21 +00:00 • committed by admin
parent c89d4ab6f3
commit 73e8e40575
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/forum/HowTo_Conflict_Resolution/comment_6_83cafddb480fa9e5b5d87d27b994b2bc._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="Horus"
subject="comment 6"
date="2016-05-05T10:01:21Z"
content="""
Normal git also has merge markers that the tell me about which part is from HEAD, which from the branch to merge.
"""]]