summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs <Xinruo@web>2014-01-02 00:41:28 +0000
committerGravatar admin <admin@branchable.com>2014-01-02 00:41:28 +0000
commit0b878708ff1b309616c3a6064330e346f692f491 (patch)
tree183d33fb8184ce7aabac391ab1bb283c9166f013 /doc
parent56e845cb399f1a540012620b906c506f7451f57f (diff)
Added a comment: Thanks
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_2_031ab6b5a2765ed9e2b185b24a8cbd78._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_2_031ab6b5a2765ed9e2b185b24a8cbd78._comment b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_2_031ab6b5a2765ed9e2b185b24a8cbd78._comment
new file mode 100644
index 000000000..d8c4ded89
--- /dev/null
+++ b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_2_031ab6b5a2765ed9e2b185b24a8cbd78._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs"
+ nickname="Xinruo"
+ subject="Thanks"
+ date="2014-01-02T00:41:27Z"
+ content="""
+That did the trick!
+"""]]