diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2023-08-17 17:58:32 -0700 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2023-08-17 17:58:36 -0700 |
| commit | ad2bad4ab42c490beca0bd3c5cd9846fdff238c2 (patch) | |
| tree | 2ef7eef001458153a10171dab12e569d0cb89410 /transcode.c | |
| parent | 434cbc05f387616e1e4014a5942e265b7451ab08 (diff) | |
Fix the scope of rubygems conflict resolution
The `git reset` and `rm_rf` are not necessary because `bundler/` is
considered as a `toplevels` and removed from the commit when there's
no conflict.
For conflict cases, it's useful to remove them from the conflict targets
before moving on to fix other paths.
Diffstat (limited to 'transcode.c')
0 files changed, 0 insertions, 0 deletions