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

sync: Automatically resolves merge conflicts.

Browse source 
untested, but it compiles :)
This commit is contained in:
Joey Hess 2012-06-27 13:08:32 -04:00
parent 051c68041b
commit 048b64024a
5 changed files with 60 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -9,6 +9,7 @@ git-annex (3.20120625) UNRELEASED; urgency=low
* Accept arbitrarily encoded repository filepaths etc when reading
git config output. This fixes support for remotes with unusual characters
in their names.
* sync: Automatically resolves merge conflicts.
-- Joey Hess <joeyh@debian.org> Mon, 25 Jun 2012 11:38:12 -0400