From 08076ce4124e4da624858afcb411e5191f714c74 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 1 Jan 2014 20:31:34 +0000 Subject: [PATCH] Added a comment --- ...comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment diff --git a/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment new file mode 100644 index 0000000000..3b1383376b --- /dev/null +++ b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 1" + date="2014-01-01T20:31:21Z" + content=""" +I think you can fix at least the immediate problem by deleting the .git/MERGE_HEAD file. + + +"""]]