Re-enable merges in git lg