git.neil.brown.name Git - wiggle.git/history

]> git.neil.brown.name Git - wiggle.git/history - merge2.c

2020-10-03	NeilBrown	Add copyright claims through to 2020	blob \| commitdiff \| raw
2020-10-03	NeilBrown	Re-indent code messed up by name-change.	blob \| commitdiff \| raw \| diff to current
2020-10-03	NeilBrown	Add "wiggle_" prefix to all exported names.	blob \| commitdiff \| raw \| diff to current
2020-10-03	NeilBrown	Move save functions to vpatch.c	blob \| commitdiff \| raw \| diff to current
2020-10-03	NeilBrown	merge: fix a problem with unmatchable hunks.	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	Merge github.com:neilbrown/wiggle	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	merge2: guard against over-flowing elcnt	blob \| commitdiff \| raw \| diff to current
2014-04-08	Jari Aalto	man: Correct preceeding to preceding	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: base tempfile name on that of original file.	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Update copyright claims.	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Browser: pass line number to editor when editting the...	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Browser: edit merge in a temporary file.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	Add some test after the markers in a merge.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	merge: fix another bug in isolate_conflicts.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	vpatch: discard 'ignored' for 'oldtype'.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	merge: fix reporting of empty "conflicts".	blob \| commitdiff \| raw \| diff to current
2013-03-22	NeilBrown	merge: be more careful about aligning hunk-headers...	blob \| commitdiff \| raw \| diff to current
2013-03-08	NeilBrown	merge: calculate number of wiggles more accurately.	blob \| commitdiff \| raw \| diff to current
2013-03-08	NeilBrown	merge: tidy up isolation of conflicts.	blob \| commitdiff \| raw \| diff to current
2013-03-01	NeilBrown	merge: Remove noise from --show-wiggles output.	blob \| commitdiff \| raw \| diff to current
2013-02-14	NeilBrown	merge: remove some meaningless AlreadyApplied	blob \| commitdiff \| raw \| diff to current
2013-02-13	NeilBrown	merge: remove useless context from the end of a conflict.	blob \| commitdiff \| raw \| diff to current
2013-02-13	NeilBrown	merge: remove useless context at the start of a conflict.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: allow changes to be ignored as well as conflict.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: avoid repeated backups.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: prompt to save change if merge was editted.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: support saving of files.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	Separate make_merger out from print_merge2	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: allow conflict to be ignored with 'x'	blob \| commitdiff \| raw \| diff to current
2012-05-15	NeilBrown	merge: make some conflicts less conflicting.	blob \| commitdiff \| raw \| diff to current
2012-05-13	Neil Brown	Move parse_patch and related to new parse.c	blob \| commitdiff \| raw \| diff to current
2012-05-10	Neil Brown	isolate_conflicts: don't look for eol that cannot be...	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	Initial all of 'End' merger.	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	Avoid buffer overflow when checking for hunk header	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	merge: avoid including large Unmatched sections in...	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	Encourage more context into conflict reports.	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	merge: factor out is_cutpoint.	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	Improve handling of hunk-header when merging.	blob \| commitdiff \| raw \| diff to current
2012-05-08	Neil Brown	Ensure that a hunk-header never appears in the middle...	blob \| commitdiff \| raw \| diff to current
2012-05-07	Neil Brown	Add --show-wiggle flag.	blob \| commitdiff \| raw \| diff to current
2012-05-07	Neil Brown	Make tracing code a bit cleaner and more organised.	blob \| commitdiff \| raw \| diff to current
2012-05-07	Neil Brown	Introduce xmalloc and use it.	blob \| commitdiff \| raw \| diff to current
2012-05-07	Neil Brown	General cleanups	blob \| commitdiff \| raw \| diff to current
2011-12-07	Alexandre Carmel...	Removed malloc.h, fixed off-by-one in bestmatch.c,...	blob \| commitdiff \| raw \| diff to current
2011-08-22	Neil Brown	Fix white space etc issues reported by checkpatch.pl	blob \| commitdiff \| raw \| diff to current
2011-08-22	Neil Brown	Update date COPYING and FSF address.	blob \| commitdiff \| raw \| diff to current
2011-08-22	Neil Brown	Fix use of uninitialised vars in merge2.	blob \| commitdiff \| raw \| diff to current
2011-08-22	Neil Brown	Make lots of functions "static".	blob \| commitdiff \| raw \| diff to current
2010-03-24	Neil Brown	Release 0.8 v0.8	blob \| commitdiff \| raw \| diff to current
2010-03-24	Neil Brown	Add --no-ignore option	blob \| commitdiff \| raw \| diff to current
2009-03-05	Neil Brown	Fix an off-by-one bug.	blob \| commitdiff \| raw \| diff to current
2006-06-09	Neil Brown	Remove all trailing blanks.	blob \| commitdiff \| raw \| diff to current
2006-05-25	Neil Brown	Get merge2 to pass all the tests...	blob \| commitdiff \| raw \| diff to current
2006-05-22	Neil Brown	Add new patch-browsing mode - needs a lot of work.	blob \| commitdiff \| raw \| diff to current

apply rejected patches and perform word-wise diffs

RSS Atom