diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-07-19 23:49:12 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 10:52:04 -0700 |
| commit | 9e2a113db95fb7e7eb3c74c1d0edc15be14fc0cf (patch) | |
| tree | 6d53e137a838cdd2460dfab99a64d0532121d5c1 /git-gui/lib/encoding.tcl | |
| parent | 60ff7f9f5c818d1e59daa47467c61ad53be2c5ec (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>
Diffstat (limited to 'git-gui/lib/encoding.tcl')
0 files changed, 0 insertions, 0 deletions