Commits

Breadcrumbs

History for

on0b528eb

User selector

All users

Datepicker

All time

Commit History

Commits on Jul 10, 2022

• cleanup: remove workaround for fixed split_inclusive() bug

  Show description for 97cecb2
  martinvonz

  committed
  97cecb2

  Copy full SHA for 97cecb2

Commits on Apr 11, 2022

• merge: fix modify/delete conflict to not resolve

  martinvonz

  committed
  97a1a3e

  Copy full SHA for 97a1a3e

Commits on Nov 7, 2021

• files: implement Debug for MergeResult, display byte vector as string

  martinvonz

  committed
  f6839a4

  Copy full SHA for f6839a4

Commits on Oct 13, 2021

• conflicts: work around rust-lang/rust#89716

  martinvonz

  committed
  c0a26f7

  Copy full SHA for c0a26f7

Commits on Jun 30, 2021

• files: make merge() accept any number of removes and adds as input

  martinvonz

  committed
  1390a04

  Copy full SHA for 1390a04

• files: make MergeHunk support any number of removes and adds

  Show description for f8c016a
  martinvonz

  committed
  f8c016a

  Copy full SHA for f8c016a

Commits on Jun 27, 2021

• files: rewrite 3-way content merge using new multi-way diff

  martinvonz

  committed
  7effefa

  Copy full SHA for 7effefa

• diff: rewrite diff() using new multi-way diff

  martinvonz

  committed
  81b51de

  Copy full SHA for 81b51de

• files: use diff::DiffHunk in DiffLine definition

  Show description for 9448fe6
  martinvonz

  committed
  9448fe6

  Copy full SHA for 9448fe6

Commits on Apr 7, 2021

• files: make diff() return an iterator instead of using a callback

  Show description for f634ff0
  martinvonz

  committed
  f634ff0

  Copy full SHA for f634ff0

Commits on Apr 1, 2021

• test: fix merge tests to expect line-based merging

  Show description for cc4b1e9
  martinvonz

  committed
  cc4b1e9

  Copy full SHA for cc4b1e9

• diff: use new diff algorithm for content diff

  Show description for c071d41
  martinvonz

  committed
  c071d41

  Copy full SHA for c071d41

• merge: use new diff algorithm for finding sync regions

  Show description for 3c35dba
  martinvonz

  committed
  3c35dba

  Copy full SHA for 3c35dba

Commits on Mar 14, 2021

• rustfmt: configure to group imports

  martinvonz

  committed
  4b8484e

  Copy full SHA for 4b8484e

Commits on Jan 22, 2021

• merge: rewrite code for 3-way merge of files to handle not just trivial cases

  Show description for bb730d8
  martinvonz

  committed
  bb730d8

  Copy full SHA for bb730d8

• diff: make tokenization return slices instead of making copies

  martinvonz

  committed
  7957fec

  Copy full SHA for 7957fec

Commits on Dec 12, 2020

• import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo

  martinvonz

  committed
  6b1427c

  Copy full SHA for 6b1427c

Loading