It works like this: ```sh git diff --name-only --diff-filter=U --relative -z | xargs -0r $(git var GIT_EDITOR) && \ git add --ignore-errors . && \ git continue ``` [I have an approximation of it as an alias](https://github.com/Rudxain/dotfiles/blob/9cfb62b2c9d8e5bc628ee6d319025f577e3ef73d/.config/git/config#L65-L68)