summaryrefslogtreecommitdiff
path: root/doc/bugs/git-annex_merge_stalls.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/bugs/git-annex_merge_stalls.mdwn')
-rw-r--r--doc/bugs/git-annex_merge_stalls.mdwn16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/git-annex_merge_stalls.mdwn b/doc/bugs/git-annex_merge_stalls.mdwn
new file mode 100644
index 000000000..98615e352
--- /dev/null
+++ b/doc/bugs/git-annex_merge_stalls.mdwn
@@ -0,0 +1,16 @@
+### Please describe the problem.
+
+Running git-annex merge shows the output "git-annex merge ", followed by a blinking cursor. The command never seems to end.
+
+### What steps will reproduce the problem?
+
+
+### What version of git-annex are you using? On what operating system?
+
+4.20130827-gd04d9bb on MacOS X Mountain Lion
+
+### Please provide any additional information below.
+
+dtruss output at https://www.dropbox.com/s/4b3yqn7ajfz5el2/annex-merge.log
+
+[[!meta title="no indication when git-annex is stuck waiting for a lock"]]