| commit | 9cc63e8e26c8644118b644b0190b1211eb1fd20b | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 12 Dec 2008 02:46:20 +0000 (11 18:46 -0800) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sat, 13 Dec 2008 02:13:26 +0000 (13 03:13 +0100) | ||
| tree | e95b4662319187b4206cdf3ea3a10e02853f226a | treesnapshot (tar.gz zip) |
| parent | e1da1cac890364624612fa76f0d81f11185cd65a | commitdiff |
Abstract the hunk header testing into a method
This way we can test for "@@@ -" and "@@@@@@@ -" for combined
diffs in octopus merges. We use the same scan test for the
basic two-way case, as the format is identical but has less
marker characters.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
This way we can test for "@@@ -" and "@@@@@@@ -" for combined
diffs in octopus merges. We use the same scan test for the
basic two-way case, as the format is identical but has less
marker characters.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
| org.spearce.jgit/src/org/spearce/jgit/patch/FileHeader.java | diffblobblamehistory | |
| org.spearce.jgit/src/org/spearce/jgit/patch/Patch.java | diffblobblamehistory |