projects / git-annex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c910b4e abd66c7)
Merge branch 'master' into smudge
authorJoey Hess <joeyh@joeyh.name>
Fri, 11 Dec 2015 17:50:31 +0000 (13:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 11 Dec 2015 17:50:31 +0000 (13:50 -0400)
1  2 
Annex/Content.hs patch | diff1 | diff2 | blob | history
debian/changelog patch | diff1 | diff2 | blob | history

diff --cc Annex/Content.hs
Simple merge
diff --cc debian/changelog
Simple merge
Unnamed repository; edit this file 'description' to name the repository.