#!/bin/bash
buscaConflictos() {
  git checkout -b mergin-sarasabasa > /dev/null 2>&1
  git rev-list --all --merges --parents --reverse |
  while IFS= read -r line
  do
    hashes=($line)
    base=${hashes[1]}
    others=${hashes[@]:2}
    git reset --hard "$base" > /dev/null
    git merge --no-commit --no-ff "$others" >/dev/null 2>&1 || echo $line
    git merge --abort > /dev/null
  done
}