Sign in
googlers
/
jrn
/
git
/
d16ece20112c9418916bca87bbed0ff68b2169e9
/
xdiff
/
xdiff.h
3319e60
xdiff: remove emit_func() and xdi_diff_hunks()
by René Scharfe
· 13 years ago
467d348
xdiff: add hunk_func()
by René Scharfe
· 13 years ago
307ab20
xdiff: PATIENCE/HISTOGRAM are not independent option bits
by Junio C Hamano
· 13 years ago
e5b0662
xdiff: remove XDL_PATCH_* macros
by Junio C Hamano
· 13 years ago
14937c2
diff: add option to show whole functions as context
by René Scharfe
· 13 years ago
739864b
xdiff: do away with xdl_mmfile_next()
by Tay Ray Chuan
· 14 years ago
8c912ee
teach --histogram to diff
by Tay Ray Chuan
· 14 years ago
a4b5e91
xdl_merge(): move file1 and file2 labels to xmparam structure
by Jonathan Nieder
· 15 years ago
8a16143
xdl_merge(): add optional ancestor label to diff3-style output
by Jonathan Nieder
· 15 years ago
560119b
refactor merge flags into xmparam_t
by Bert Wesarg
· 15 years ago
cd1d61c
make union merge an xdl merge favor
by Bert Wesarg
· 15 years ago
06dbc1e
Merge branch 'jc/conflict-marker-size'
by Junio C Hamano
· 15 years ago
9914cf4
xdl_merge(): allow passing down marker_size in xmparam_t
by Junio C Hamano
· 15 years ago
00f8f97
xdl_merge(): introduce xmparam_t for merge specific parameters
by Junio C Hamano
· 15 years ago
73eb40e
git-merge-file --ours, --theirs
by Junio C Hamano
· 17 years ago
5dc1308
Merge branch 'js/patience-diff'
by Junio C Hamano
· 16 years ago
92b7de9
Implement the patience diff algorithm
by Johannes Schindelin
· 16 years ago
6d0e674
diff: add option to show context between close hunks
by René Scharfe
· 16 years ago
ef2e62f
Allow alternate "low-level" emit function from xdl_diff
by Brian Downing
· 16 years ago
e0af48e
xdiff-merge: optionally show conflicts in "diff3 -m" style
by Junio C Hamano
· 17 years ago
ee95ec5
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
by Johannes Schindelin
· 17 years ago
f258475
Per-path attribute based hunk header selection.
by Junio C Hamano
· 18 years ago
a6080a0
War on whitespace
by Junio C Hamano
· 18 years ago
859f9c4
teach diff machinery about --ignore-space-at-eol
by Johannes Schindelin
· 18 years ago
857b933
xdiff: add xdl_merge()
by Johannes Schindelin
· 18 years ago
a9ed376
xdiff: generate "anti-diffs" aka what is common to two files
by Linus Torvalds
· 19 years ago
0d21efa
Teach diff about -b and -w flags
by Johannes Schindelin
· 19 years ago
acb7257
xdiff: Show function names in hunk headers.
by Mark Wooding
· 19 years ago
3443546
Use a *real* built-in diff generator
by Linus Torvalds
· 19 years ago