Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 48469:a16eedf47843

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -7 tip
age author description
Tue, 14 Dec 2021 13:41:34 -0800 Martin von Zweigbergk filemerge: remove leftover documentation of removed argument
Mon, 06 Dec 2021 12:30:54 -0800 Martin von Zweigbergk filemerge: remove `premerge` argument from `_makebackup()`
Fri, 03 Dec 2021 22:45:35 -0800 Martin von Zweigbergk filemerge: inline `_filemerge()` into `filemerge()`
Fri, 03 Dec 2021 21:41:43 -0800 Martin von Zweigbergk filemerge: make `_filemerge()` do both premerge and merge
Fri, 03 Dec 2021 16:21:46 -0800 Martin von Zweigbergk filemerge: merge `premerge()` into `filemerge()`
Fri, 19 Nov 2021 18:48:34 -0800 Martin von Zweigbergk filemerge: simplify slightly by using filectx.decodeddata()
Fri, 19 Nov 2021 18:14:25 -0800 Martin von Zweigbergk filemerge: rename _formatconflictmarker() since it formats a label
less more | (0) -100 -30 -10 -7 tip