diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-03-20 16:10:11 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-03-20 16:10:11 +0000 |
| commit | 75d17e58dc68aa30ca87732731c7dedf0a4f5457 (patch) | |
| tree | 920e20d842da81addfb22ec8faa453f6e62d147d | |
| parent | 2c3cc6647a7ed4ad12aa4dda57d91fd02035cf5d (diff) | |
Added a comment
| -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. +"""]] |