Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/bundles/test-merge-symlinks.hg
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 07 Jan 2022 22:16:22 -0800
changeset 48585 c6649c53073f
parent 14116 cd3032437064
permissions -rw-r--r--
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14116
cd3032437064 tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 5408
diff changeset 
     1
 
(binary:application/octet-stream)
hg-stable