sync: Automatically resolves merge conflicts.
untested, but it compiles :)
This commit is contained in:
parent
051c68041b
commit
048b64024a
5 changed files with 60 additions and 12 deletions
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue