diff --git a/dim b/dim
index 449e12e7e9365bc4c4ff435a1ac8b4510eed8de7..f83f91ffff3b1dd84b4ccd5d82ba050d5631f422 100755
--- a/dim
+++ b/dim
@@ -652,6 +652,10 @@ function dim_rebuild_tip
 		exit 1
 	fi
 
+	# rerere uses sha1 of the diff to identify conflicts, we must ensure
+	# that they look the same for everyone
+	git config merge.conflictstyle merge
+
 	for repo in "${!drm_tip_repos[@]}"; do
 		remote=$(repo_to_remote $repo)
 		echo -n "Fetching $repo (local remote $remote)... "