diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-20 12:13:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-20 12:13:45 -0400 |
| commit | a2144a1917c98c78d5f77cc707ab1b41f4e29e2e (patch) | |
| tree | 133571a5491f6c4af7dc6e004b03ec74f0b23cf0 /doc/automatic_conflict_resolution | |
| parent | cd1cd96eb030f7423847c161ca24d3b42f05f982 (diff) | |
| parent | 75d17e58dc68aa30ca87732731c7dedf0a4f5457 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/automatic_conflict_resolution')
| -rw-r--r-- | doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment b/doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment new file mode 100644 index 000000000..58bdc5631 --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.102" + subject="comment 3" + date="2014-03-20T16:10:10Z" + content=""" +@Matthias `git annex merge` will do what you want, as long as you have git-annex 4.20130709 or newer. +"""]] |