Mercurial > hg
graph
-
filemerge: move check for identical sides out of filemerge()Mon, 07 Feb 2022 22:54:38 -0800, by Martin von Zweigbergk
-
mergestate: use an early return for trivial mergesMon, 07 Feb 2022 20:12:09 -0800, by Martin von Zweigbergk
-
simplemerge: remove now-unused argumentsMon, 07 Feb 2022 14:07:04 -0800, by Martin von Zweigbergk
-
merge: fix documented order of `labels` argumentTue, 18 Jan 2022 13:22:55 -0800, by Martin von Zweigbergk
-
filemerge: when not keeping premerge, don't write markers to contextTue, 18 Jan 2022 12:57:55 -0800, by Martin von Zweigbergk
-
simplemerge: move printing of merge result to extensionFri, 14 Jan 2022 08:17:13 -0800, by Martin von Zweigbergk
-
simplemerge: remove code for checking binary input now that callers do itThu, 10 Feb 2022 15:48:01 -0800, by Martin von Zweigbergk