Martin von Zweigbergk c6f6498cc9 conflicts: add newline after conflict marker lines ...

Merging is currently done with line-level granularity, so it makes
sense to have newlines after the markers. That makes them easier to
edit out when resolving conflicts.

2021-04-24 13:53:24 -07:00

..

benches

diff: first diff lines, then refine to words, producing better diffs

2021-04-04 21:50:31 -07:00

protos

view: add tracking of "public" heads (copying Mercurial's phase concept)

2021-01-16 11:48:35 -08:00

src

conflicts: add newline after conflict marker lines

2021-04-24 13:53:24 -07:00

tests

revsets: add "ancestor difference" range operator (like git's ..)

2021-04-23 19:10:28 -07:00

build.rs

rustfmt: configure to group imports

2021-03-14 10:46:25 -07:00

Cargo.toml

revsets: define grammar in pest

2021-04-18 21:25:58 -07:00