diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-05 20:02:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-05 20:02:15 -0800 |
| commit | d8af75d76f224eb8311bc3815f36cf126d309277 (patch) | |
| tree | c3ccda9401edc5df20f7158186ce78ff41746d6d /t/t4252/am-test-1-1 | |
| parent | git-p4: Fix bug in p4Where method. (diff) | |
| parent | git-am: rename apply_opt_extra file to apply-opt (diff) | |
| download | tgif-d8af75d76f224eb8311bc3815f36cf126d309277.tar.xz | |
Merge branch 'jc/am-options'
* jc/am-options:
git-am: rename apply_opt_extra file to apply-opt
Test that git-am does not lose -C/-p/--whitespace options
git-am: propagate --3way options as well
git-am: propagate -C<n>, -p<n> options as well
git-am --whitespace: do not lose the command line option
Diffstat (limited to 't/t4252/am-test-1-1')
| -rw-r--r-- | t/t4252/am-test-1-1 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t4252/am-test-1-1 b/t/t4252/am-test-1-1 new file mode 100644 index 0000000000..b0c09dc965 --- /dev/null +++ b/t/t4252/am-test-1-1 @@ -0,0 +1,19 @@ +From: A U Thor <au.thor@example.com> +Date: Thu Dec 4 16:00:00 2008 -0800 +Subject: Three + +Application of this should be rejected because the first line in the +context does not match. + +diff --git i/file-1 w/file-1 +index 06e567b..10f8342 100644 +--- i/file-1 ++++ w/file-1 +@@ -1,6 +1,6 @@ + One + 2 +-3 ++Three + 4 + 5 + 6 |