summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-09 14:46:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-09 14:46:20 -0400
commitfd23b3ac4fb99850e017694e48ceb2538143c935 (patch)
tree39f54b51ad197a167bbf6e4ec77e67871555d0e1 /doc/automatic_conflict_resolution.mdwn
parent5672bc92978b68b2020bac3a311347652d9665ca (diff)
adjust test suite for changed dropunused behavior with bogus numbers
Diffstat (limited to 'doc/automatic_conflict_resolution.mdwn')
0 files changed, 0 insertions, 0 deletions