diff options
| -rw-r--r-- | tests/concat-git-diff | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/tests/concat-git-diff b/tests/concat-git-diff index 445fd97..52d3004 100644 --- a/tests/concat-git-diff +++ b/tests/concat-git-diff @@ -45,3 +45,43 @@ EOF check 'cat f' <<EOF three EOF + +cat > f <<EOF +1 +2 +3 +EOF + +cat > concat2.diff <<EOF +diff --git a/f b/f +index 01e79c3..0d0b976 100644 +--- a/f ++++ b/f +@@ -1,3 +1,4 @@ + 1 + 2 + 3 ++b +diff --git a/f b/f +index 0d0b976..6b2348d 100644 +--- a/f ++++ b/f +@@ -1,3 +1,4 @@ ++a + 1 + 2 + 3 +EOF + +check 'patch -p1 < concat2.diff || echo "Status: $?"' <<EOF +patching file f +patching file f +EOF + +check 'cat f' <<EOF +a +1 +2 +3 +b +EOF |