diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-07-19 23:49:17 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-07-20 10:53:01 -0700 |
| commit | 0f62fbae652982d9bb286abed689e9223b0f998e (patch) | |
| tree | 1cd749703ab95a3ccb102e42897e12fcf0259cc8 /templates/branches-- | |
| parent | t4150: tests for am --[no-]scissors (diff) | |
| download | tgif-0f62fbae652982d9bb286abed689e9223b0f998e.tar.xz | |
t3418: non-interactive rebase --continue with rerere enabled
Since 8389b52 (git-rerere: reuse recorded resolve., 2006-01-28), git-am
will call git-rerere to re-use recorded merge conflict resolutions if
any occur in a threeway merge.
Add a test to ensure that git-rerere is called by git-am (which handles
the non-interactive rebase).
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates/branches--')
0 files changed, 0 insertions, 0 deletions