summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2024-05-28 17:45:21 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2024-05-28 17:46:44 -0700
commit0e96dd93c51337a01fa29b563c2d330c472b03b7 (patch)
tree26d20a9fa700220949796f1b52b6cb783970ddf1 /test/ruby
parent4d34fb54b0e21af3802cddb669f34fe446ed5f3d (diff)
merger.rb: Don't ask "conflicts resolved?" if not needed
Diffstat (limited to 'test/ruby')
0 files changed, 0 insertions, 0 deletions