[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts
From: |
Stefan Monnier |
Subject: |
bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file |
Date: |
Tue, 20 Feb 2024 09:03:26 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
>> BTW, your use of [upper base lower] as a completion table is both
>> cute and horrible at the same time :-)
> Hahah, why? 😅
It's cute because it's concise and it kinda works.
It's horrible because vectors are not among the supported formats for
completion-tables: what you wrote will be assumed to be an obarray and what
you wrote is not a correct obarray. The resulting behavior could be
surprising (e.g. include more entries than the one you wrote).
Stefan
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, (continued)
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/19
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Stefan Monnier, 2024/02/20
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/20
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file,
Stefan Monnier <=
- bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file, Konstantin Kharlamov, 2024/02/20