diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:09:33 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:00 -0700 |
| commit | 18acb30ee458a4a413d987215af41b4a76643f5d (patch) | |
| tree | 1dfbc02064ad0885946f20c260c5bee058eb9557 /builtin/commit.c | |
| parent | Don't expand CRLFs when normalizing text during merge (diff) | |
| download | git-18acb30ee458a4a413d987215af41b4a76643f5d.tar.gz git-18acb30ee458a4a413d987215af41b4a76643f5d.zip | |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions