diff options
| author | Martin Renold <martinxyz@gmx.ch> | 2009-07-01 20:18:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-02 02:46:30 (GMT) |
| commit | 606475f3178784e5a6b3a01dce1a54314345cf43 (patch) | |
| tree | bd641f06c6fd9d71d54e6909e26560ab21c254d5 /t/t3404-rebase-interactive.sh | |
| parent | 702beb3af0531bae95ab559fff043785614d53f2 (diff) | |
| download | git-606475f3178784e5a6b3a01dce1a54314345cf43.zip git-606475f3178784e5a6b3a01dce1a54314345cf43.tar.gz git-606475f3178784e5a6b3a01dce1a54314345cf43.tar.bz2 | |
Remove filename from conflict markers
Put filenames into the conflict markers only when they are different.
Otherwise they are redundant information clutter.
Print the filename explicitely when warning about a binary conflict.
Signed-off-by: Martin Renold <martinxyz@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c32ff66..a973628 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -119,11 +119,11 @@ index e69de29..00750ed 100644 EOF cat > expect2 << EOF -<<<<<<< HEAD:file1 +<<<<<<< HEAD 2 ======= 3 ->>>>>>> b7ca976... G:file1 +>>>>>>> b7ca976... G EOF test_expect_success 'stop on conflicting pick' ' |