[PATCH stable] merge: more safe detection of criss cross merge conflict between dm and r

• Previous message (by thread): [PATCH evolve-ext] uncommit: don't lose copy information of remaining files (issue5403)
• Next message (by thread): [PATCH 2 of 3 stable] tests: correct (I think) command in test-largefiles-update
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

• Previous message (by thread): [PATCH evolve-ext] uncommit: don't lose copy information of remaining files (issue5403)
• Next message (by thread): [PATCH 2 of 3 stable] tests: correct (I think) command in test-largefiles-update
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]