index
:
delta/patch.git
base85
baserock/bootstrap
baserock/bootstrap-pass1
baserock/bootstrap-pass2
baserock/build-essential
baserock/morph
baserock/samthursfield/build-essential
baserock/v2.7.1
master
origin
rcs-history
testing
git.savannah.gnu.org: git/patch.git
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
src
/
merge.c
Commit message (
Expand
)
Author
Age
Files
Lines
*
build: update gnulib submodule to latest
Andreas Gruenbacher
2014-11-30
1
-2
/
+1
*
maint: update all copyright year number ranges
Jim Meyering
2012-01-01
1
-1
/
+1
*
maint: update copyright date year ranges to include 2011
Jim Meyering
2011-03-27
1
-1
/
+1
*
Globally rename type LINENUM to lin (as in diffutils)
Andreas Gruenbacher
2010-04-19
1
-51
/
+48
*
diffseq: Use the gnulib version instead of a private copy
Andreas Gruenbacher
2010-04-19
1
-1
/
+1
*
Merge: detect already-applied inserts at the end of files
Andreas Gruenbacher
2010-02-21
1
-5
/
+8
*
No longer use "continue" as the only instruction in a loop body
Andreas Gruenbacher
2010-01-15
1
-2
/
+2
*
* src/bestmatch.h, src/common.h, src/diffseq.h, src/inp.c, src/inp.h,
Andreas Gruenbacher
2010-01-02
1
-12
/
+11
*
* src/patch.c (longopts, get_some_switches): Add an optional argument
Andreas Gruenbacher
2009-12-29
1
-11
/
+38
*
Clarify the message when (part of) a hunk cannot be merged
Andreas Gruenbacher
2009-10-27
1
-1
/
+1
*
When merging, make sure that hunks will not end up "out of order"
Andreas Gruenbacher
2009-05-12
1
-0
/
+2
*
Add a similar asymmetric hunk check to locate_merge()
Andreas Gruenbacher
2009-04-05
1
-0
/
+7
*
Move all source and header files into src/
Andreas Gruenbacher
2009-04-05
1
-0
/
+538
