Mercurial > hg

log tests/test-merge-tools.t @ 50329:3dbc7b1ecaba stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -30 -10 -7 tip
age author description
Tue, 15 Mar 2022 13:31:39 -0700 Martin von Zweigbergk filemerge: when merge tool uses $output, don't leave markers in $local stable
Tue, 15 Mar 2022 13:40:45 -0700 Martin von Zweigbergk tests: demonstrate how conflict markers end up $local *and* $output stable
Fri, 18 Feb 2022 12:51:23 +0100 Raphaël Gomès windows: adjust test output in test-merge-tools.t stable
Fri, 11 Feb 2022 16:52:48 -0800 Martin von Zweigbergk filemerge: put temporary files in single temp dir by default
Tue, 18 Jan 2022 15:04:55 -0800 Martin von Zweigbergk merge: set custom conflict label for base commit
Thu, 20 Jan 2022 11:06:52 -0800 Martin von Zweigbergk simplemerge: take over formatting of label from `filemerge`
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label
less more | (0) -30 -10 -7 tip