Sign in
googlers
/
jrn
/
git
/
f5b2af06f55c0f21ae0199be5fe120f2cccd698b
/
xdiff
/
xmerge.c
43ad3af
xdiff: handle allocation failure when merging
by Phillip Wood
· 2 years, 11 months ago
4a37b80
xdiff: refactor a function
by Phillip Wood
· 2 years, 11 months ago
4496526
xdiff: implement a zealous diff3, or "zdiff3"
by Phillip Wood
· 3 years, 1 month ago
4842579
Replace Free Software Foundation address in license notices
by Todd Zullinger
· 7 years ago
c1fa85f
Merge branch 'ps/plug-xdl-merge-leak'
by Junio C Hamano
· 9 years ago
4867f11
xdiff/xmerge: fix memory leak in xdl_merge
by Patrick Steinhardt
· 9 years ago
15980de
merge-file: ensure that conflict sections match eol style
by Johannes Schindelin
· 9 years ago
86efa21
merge-file: let conflict markers match end-of-line style of the context
by Johannes Schindelin
· 9 years ago
ba31180
git-merge-file: do not add LF at EOF while applying unrelated change
by Max Kirillov
· 11 years ago
349362c
xdiff: cast arguments for ctype functions to unsigned char
by Jonathan Nieder
· 14 years ago
c8c073c
xdiff/xmerge.c: use memset() instead of explicit for-loop
by Alexey Mahotkin
· 15 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
456cb4c
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
by Junio C Hamano
· 16 years ago
5719db9
Change xdl_merge to generate output even for null merges
by Charles Bailey
· 16 years ago
8313374
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
by Junio C Hamano
· 16 years ago
838338c
xmerge.c: minimum readability fixups
by Junio C Hamano
· 16 years ago
e0af48e
xdiff-merge: optionally show conflicts in "diff3 -m" style
by Junio C Hamano
· 16 years ago
f2b25dd
xdl_fill_merge_buffer(): separate out a too deeply nested function
by Junio C Hamano
· 16 years ago
ee95ec5
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
by Johannes Schindelin
· 17 years ago
f407f14
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
by Johannes Schindelin
· 17 years ago
22b6abc
Fix yet another subtle xdl_merge() bug
by Johannes Schindelin
· 18 years ago
5d6b151
xdl_merge(): fix a segmentation fault when refining conflicts
by Johannes Schindelin
· 18 years ago
98e6da8
xdl_merge(): fix and simplify conflict handling
by Johannes Schindelin
· 18 years ago
710daa8
xdl_merge(): fix thinko
by Johannes Schindelin
· 18 years ago
875b8ce
xdl_merge(): fix an off-by-one bug
by Johannes Schindelin
· 18 years ago
53a7085
xmerge: make return value from xdl_merge() more usable.
by Junio C Hamano
· 18 years ago
857b933
xdiff: add xdl_merge()
by Johannes Schindelin
· 18 years ago