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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-03-20 12:13:45 -04:00
commit 63535e3dc7
3 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/automatic_conflict_resolution/comment_3_5c587c6633cae1c8547ca970d55ee97e._comment Normal file
View file

@ -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.
"""]]

10
doc/forum/Git_annex_on_Windows/comment_7_75d4450b4608ad0b453bc69159e708de._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.102"
subject="comment 7"
date="2014-03-20T16:04:36Z"
content="""
Hmm, putting git-annex.exe in to bin and not cmd with mysysgit 1.8.5.2 will make \"git annex\" work, but \"git-annex\" will not.
What version of msysgit has the problem with bin?
"""]]

8
doc/install/cabal/comment_35_4d44e4531e6686bd340f26836ad40026._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.102"
subject="comment 35"
date="2014-03-20T16:06:22Z"
content="""
The `errMessage` build failure is due to a new version of optparse-applicative. I've added support for it in git master.
"""]]