diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-12-15 21:49:58 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-12-15 22:37:38 +0900 |
| commit | 7cbc08b388cfc6d9bd2023c313165bff37ba2c11 (patch) | |
| tree | 26d7739b7dad0922099288277e5cf6e0510484e4 /complex.c | |
| parent | 854ff25f4f4a0c1183b742bd5077985236348c57 (diff) | |
Follow removed conflict files
After editing a conflict, continue without removed files.
Diffstat (limited to 'complex.c')
0 files changed, 0 insertions, 0 deletions