git_log.rb in grog-0.0.5

- old
+ new

@@ -1,6 +1,7 @@
 require 'term/ansicolor'
+require 'grog/list_hash'
 
 module Grog
   class GitLog
     @@placeholders = %w{H P an ai s}
     def initialize(options)
@@ -112,10 +113,10 @@
     end
 
     def get_all_branches
       local_branches = branch_names_from_branch_command(:local)
       remote_branches = branch_names_from_branch_command(:remote)
-      @branches = local_branches.merge(remote_branches)
+      @branches = Grog::ListHash.merge_lists(local_branches, remote_branches)
     end
 
     def get_all_tags
       tag_names = GitLog.lines_of_command("git tag")
       @tags = GitLog.hash_from_rev_names(tag_names, 'refs/tags')