Mercurial > hg-stable

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 48588: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip
age author description
Fri, 07 Jan 2022 23:29:19 -0800 Martin von Zweigbergk simplemerge: move default labels to simplemerge extension
Fri, 07 Jan 2022 22:23:44 -0800 Martin von Zweigbergk simplemerge: use same newline detection for :mergediff as for :merge[3]
Tue, 11 Jan 2022 16:54:42 -0800 Martin von Zweigbergk simplemerge: clarify names of functions that render conflict markers
Fri, 07 Jan 2022 22:16:22 -0800 Martin von Zweigbergk simplemerge: make merge_lines() a free function
Fri, 07 Jan 2022 18:42:31 -0800 Martin von Zweigbergk simplemerge: convert `merge_lines()` away from generator
Tue, 14 Dec 2021 13:12:56 -0800 Martin von Zweigbergk simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
less more | rev 48588: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip