| commit | 18acb30ee458a4a413d987215af41b4a76643f5d | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Thu, 5 Aug 2010 11:09:33 +0000 (5 06:09 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Aug 2010 16:20:00 +0000 (6 09:20 -0700) | ||
| tree | 1dfbc02064ad0885946f20c260c5bee058eb9557 | treesnapshot (tar.gz zip) |
| parent | 43dd2332853b2460a5252b0f43d8de3c5b545b9a | commitdiff |
t6038 (merge.renormalize): style nitpicks
Some tweaks to simplify adding and running tests.
- Use test_tick for predictable, sort of realistic commit dates;
- Use test_cmp as "test_cmp expected actual" --- some crazy
content that was not expected should cause the test to fail;
- Remove and re-add all files at the start of each test so the
worktree is easier to think about;
- Avoid using cat where not necessary for clarity.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Some tweaks to simplify adding and running tests.
- Use test_tick for predictable, sort of realistic commit dates;
- Use test_cmp as "test_cmp expected actual" --- some crazy
content that was not expected should cause the test to fail;
- Remove and re-add all files at the start of each test so the
worktree is easier to think about;
- Avoid using cat where not necessary for clarity.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6038-merge-text-auto.sh | diffblobblamehistory |