summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg <Tim@web>2013-10-17 16:04:05 +0000
committerGravatar admin <admin@branchable.com>2013-10-17 16:04:05 +0000
commit02a927da4e2714086ac840842d821bd53caee7b3 (patch)
treec5e68b62943d3fc84a0fe46668a0617720ac7fc0 /doc
parent98f6bf3e35ab4c213890f1babc6a48a664b727f2 (diff)
Added a comment
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment
new file mode 100644
index 000000000..4adee73bd
--- /dev/null
+++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
+ nickname="Tim"
+ subject="comment 3"
+ date="2013-10-17T16:04:03Z"
+ content="""
+I had a recent backup of the data so no real harm was done.
+"""]]