Artifact [979a4eb47e]

Artifact 979a4eb47eb24cad6702d185f7f5a3d9fd40ffd3a4d02b6d911ed2e9af5f48be:

• File internal/merge/example_test.go — part of check-in [f5744359d3] at 2026-04-19 16:30:54 on branch trunk — Initial open source release

  libfossil is a pure-Go implementation of the Fossil SCM, reading and writing the same .fossil SQLite repository format as upstream Fossil.

  This is the first public release of code that previously lived in a private repository. The module path is github.com/danmestas/libfossil and the binary is named libfossil to avoid $PATH collisions with upstream fossil.

  Included: - Repo lifecycle (create, clone), checkout/checkin, timeline, merge, diff, annotate, shun, tag, branch, bisect, stash, undo/redo - Sync-over-HTTP protocol (client and handler) - Two SQLite drivers: modernc (pure Go, default) and ncruces (wasm-capable) - Observer interfaces (SyncObserver, CheckoutObserver) with an optional OpenTelemetry implementation in observer/otel (separate submodule) - Deterministic simulation testing harness with BUGGIFY fault injection - Kong-based embeddable CLI under cli/ and a standalone binary under cmd/libfossil/ (user: [email protected], size: 563) [annotate] [blame] [check-ins using]

package merge_test

import (
	"fmt"

	"github.com/danmestas/libfossil/internal/merge"
)

func ExampleThreeWayText() {
	base := []byte("line 1\nline 2\nline 3\n")
	local := []byte("line 1\nlocal change\nline 3\n")
	remote := []byte("line 1\nline 2\nline 3\nremote addition\n")

	result, err := (&merge.ThreeWayText{}).Merge(base, local, remote)
	if err != nil {
		fmt.Println("error:", err)
		return
	}
	fmt.Println("clean:", result.Clean)
	fmt.Print(string(result.Content))
	// Output:
	// clean: true
	// line 1
	// local change
	// line 3
	// remote addition
}