My normalization hack fell over a topic branch :( Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index 457bf93d8a11..6d3b9734b348 100755 --- a/dim +++ b/dim @@ -502,7 +502,7 @@ function dim_rebuild_tip git merge --rerere-autoupdate --no-commit $sha1 >& /dev/null || true # normalize conflict markers if git grep -l '^>>>>>>> ' &> /dev/null ; then - git grep -l '^>>>>>>> ' | xargs sed -e "s/^>>>>>>> .*$/>>>>>>> $repo\/$branch/" -i + git grep -l '^>>>>>>> ' | xargs sed -e "s|^>>>>>>> .*$|>>>>>>> $repo\/$branch|" -i fi if [ -f $fixup_file ] ; then -- 2.11.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
