diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-05-12 15:29:28 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-05-12 15:39:36 +0200 |
| commit | 889d33db47d8266e5796d61d87125dd1192007cb (patch) | |
| tree | 7f92ea5ca15a248d65d8b0d518a0209945f947c0 | |
| parent | b008dece18e6b94b8a13ea44a253855bf407ed01 (diff) | |
| download | patch-889d33db47d8266e5796d61d87125dd1192007cb.tar.gz | |
When merging, make sure that hunks will not end up "out of order"
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c index 820d1e8..9aa9790 100644 --- a/src/merge.c +++ b/src/merge.c @@ -146,6 +146,8 @@ locate_merge (LINENUM *matched) out: *matched = max_matched; + if (where < min_where) + where = min_where; return where; } |