| commit | 9e2a113db95fb7e7eb3c74c1d0edc15be14fc0cf | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Sun, 19 Jul 2015 15:49:12 +0000 (19 23:49 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Jul 2015 17:52:04 +0000 (20 10:52 -0700) | ||
| tree | 6d53e137a838cdd2460dfab99a64d0532121d5c1 | treesnapshot (tar.gz zip) |
| parent | 60ff7f9f5c818d1e59daa47467c61ad53be2c5ec | commitdiff |
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>
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 | diffblobblamehistory |