fish
vim -O (git diff --name-only --diff-filter=U)
vim -O (git diff @^ @ --name-only)
happiness (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) (^_^) happiness
vim -O (git diff --name-only --diff-filter=U)
vim -O (git diff @^ @ --name-only)