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

resolvemerge: New plumbing command that runs the automatic merge conflict resolver.

Browse source
This commit is contained in:
Joey Hess 2014-07-11 16:45:18 -04:00
parent 003ebf58f5
commit cb66ca3a76
6 changed files with 60 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -9,6 +9,8 @@ git-annex (5.20140710) UNRELEASED; urgency=medium
* S3: Deal with AWS ACL configurations that do not allow creating or
checking the location of a bucket, but only reading and writing content to
it.
* resolvemerge: New plumbing command that runs the automatic merge conflict
resolver.
-- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 23:29:21 -0400