merge-recursive: make "CONFLICT (rename/delete)" message show both paths

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 4f00bdd3d69babe8a58c4989406eaa6fb5f36a50..fe30be38dc8c534cabf8a0f7145c41aecd1e6989 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -259,7 +259,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
         rm -f $@ ; \
         echo '# Autogenerated by git-gui Makefile' >$@ && \
         echo >>$@ && \
-        $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
+        $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
         echo >>$@ ; \
        fi