More sorting

benedikt-schesch · Sep 21, 2024 · db184d4 · db184d4
1 parent 2a49ee8
commit db184d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/scripts/merge_tools/merge_script_then_plumelib.sh b/src/scripts/merge_tools/merge_script_then_plumelib.sh
@@ -54,7 +54,7 @@ esac
 git-mergetool.sh $all_arg --tool=merge-plumelib
 
 # Check if there are still conflicts
-diffs=$(git diff --name-only --diff-filter=U)
+diffs=$(git diff --name-only --diff-filter=U | sort)
 if [ -z "$diffs" ]; then
     git add .
     git commit -m "Resolved conflicts by calling: git-mergetool.sh $all_arg --tool=merge-plumelib"