chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b4f6718) | patch
t2800: Adapt to changes in git's conflict markers
authorKarl Wiberg <kha@treskal.com>
Wed, 15 Jul 2009 09:25:53 +0000 (11:25 +0200)
committerKarl Wiberg <kha@treskal.com>
Wed, 15 Jul 2009 09:50:46 +0000 (11:50 +0200)
commit533d85c2f663a7e89816b23c627a118866ab00fb
treed1d30b69d5527748fb029e866972793e545f5f36tree | snapshot
parentb4f67189be1f267aa6bcb05d442f6e7c5cf6697fcommit | diff
t2800: Adapt to changes in git's conflict markers

The conflict markers used by git were changed slightly by commit
606475f3 ("Remove filename from conflict markers"); specifically, the
conflict markers contain the filename only when the filename has
changed.

This patch adapts t2800 to allow either the new or the old format.

Signed-off-by: Karl Wiberg <kha@treskal.com>
t/t2800-goto-subdir.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)