]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2824df2) | patch
Separate make_merger out from print_merge2
authorNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 01:45:23 +0000 (12:45 +1100)
committerNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 01:45:23 +0000 (12:45 +1100)
commit3b82e3f78a0299624ff3c523fbbf73458ca46e12
tree61f0294c060a43b9313a520903be3b559642ed56tree | snapshot
parent2824df2caeda11f1e10bca7a3a3e545a65eef93acommit | diff
Separate make_merger out from print_merge2

Will want to print a 'merger' that we have modified.  So don't
call make_merger from print_merge, call it before hand and pass it in.

Signed-off-by: NeilBrown <neilb@suse.de>
merge2.c diff | blob | history
wiggle.c diff | blob | history
wiggle.h diff | blob | history
apply rejected patches and perform word-wise diffs