]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 60ff7f9) | patch
t4150: am --resolved fails if index has unmerged entries
authorPaul Tan <pyokagan@gmail.com>
Sun, 19 Jul 2015 15:49:12 +0000 (23:49 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jul 2015 17:52:04 +0000 (10:52 -0700)
commit9e2a113db95fb7e7eb3c74c1d0edc15be14fc0cf
tree6d53e137a838cdd2460dfab99a64d0532121d5c1tree | snapshot
parent60ff7f9f5c818d1e59daa47467c61ad53be2c5eccommit | diff
t4150: am --resolved fails if index has unmerged entries

Since c1d1128 (git-am --resolved: more usable error message.,
2006-04-28), git-am --resolved will check to see if there are any
unmerged entries, and will error out with a user-friendly error message
if there are.

Add a test for this.

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>
t/t4150-am.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.