cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-15 12:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,117 Commits 145 Branches 36 Tags
Commit Graph

3 Commits

Author SHA1 Message Date
Martin von Zweigbergk
732e448458 diff_util: use MergedTree throughout 
This switches the whole `diff_util` module to working with
`MergedTree`, `Merge<Option<TreeValue>>` etc., so it can support
tree-level conflicts.

Since we want to avoid using `ConflictId`s, I switched the hash we use
for conflicts in `--git` style diffs to use an all-'0' id instead of
using the conflict id.
 2023-08-27 07:50:28 -07:00
Yuya Nishihara
17b45d642f cli: add "--limit N" option to log-like commands 
Copied from Mercurial. This isn't a revset predicate since our revset is
conceptually unordered.
 2023-08-11 10:40:40 +09:00
Martin von Zweigbergk
0075174308 tests: move tests/ under cli/ so they're run again 
Thanks to @ilyagr for noticing that they should be moved.
 2023-08-05 06:18:59 +00:00