summaryrefslogtreecommitdiff
path: root/doc/todo/conflict_free_comment_merges.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-03-29 13:27:50 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-03-29 13:27:50 -0400
commit68c67efeffd0f51e01cd557722632367f0dc3849 (patch)
tree871e25220c9873320a9f83fc8a084579ea6e809d /doc/todo/conflict_free_comment_merges.mdwn
parent6798a80acab43ce9b6869dea7236887faebc19e1 (diff)
clarify example with whitespace
Diffstat (limited to 'doc/todo/conflict_free_comment_merges.mdwn')
0 files changed, 0 insertions, 0 deletions