summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-13 12:22:18 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-13 12:22:18 -0400
commit6f2eee889c9ff44bee5fd0a02126acc042ea3dde (patch)
tree3b4f743b63f8733b86ad6c0d3e46aff320d375bd /doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment
parent947d3e385966c36ad695639602faffa32d4f8b31 (diff)
add news item for git-annex 5.20150113
Diffstat (limited to 'doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment')
0 files changed, 0 insertions, 0 deletions