Adding a functions and redoing the tattoo to use the r/X tags.
[git-central.git] / tests / t2204-1.txt
2008-09-28 Stephen HabermanTest the conflict diff email.