log tests/test-merge-exec.t @ 46667:93e9f448273c

age author description
Sat, 16 May 2020 20:38:53 +0200 Pierre-Yves David flags: also test merge with executable bit removed stable
Sat, 16 May 2020 20:38:42 +0200 Pierre-Yves David flags: also test the removal of the exec flag stable
Sat, 16 May 2020 20:38:31 +0200 Pierre-Yves David flags: read flag from dirstate/disk for workingcopyctx (issue5743) stable
Sat, 16 May 2020 20:38:19 +0200 Pierre-Yves David flags: actually merge flags in simplemerge stable
Sat, 16 May 2020 20:38:07 +0200 Pierre-Yves David flags: add a test for merging exec flag change with rename and file change stable
Sat, 16 May 2020 20:37:56 +0200 Pierre-Yves David flags: account for flag change when tracking rename relevant to merge stable
Sat, 16 May 2020 20:37:44 +0200 Pierre-Yves David flags: also test merging a rename with and exec flag change stable
Sat, 16 May 2020 20:37:33 +0200 Pierre-Yves David flags: introduce explicit testing for merging change to exec flag stable