Permalink
Browse files

.git/ORIG_HEAD also an indicator of merge conflict

  • Loading branch information...
1 parent 17824dc commit 4abed454607d2fecc9befb0a3ff82e41c8d3cb40 @timcharper timcharper committed Nov 12, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-submodule-resolve
View
2 git-submodule-resolve
@@ -10,7 +10,7 @@ unless File.directory?(".git")
exit 1
end
-orig_head_file = %w[.git/MERGE_HEAD .git/rebase-apply/original-commit].select {|f| File.exist?(f) }.first
+orig_head_file = %w[.git/MERGE_HEAD .git/rebase-apply/original-commit .git/ORIG_HEAD].select {|f| File.exist?(f) }.first
unless orig_head_file
STDERR.puts "Error: Not currently resolving a conflict"

0 comments on commit 4abed45

Please sign in to comment.