diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-05-29 19:44:40 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-05-29 09:14:52 -0700 |
| commit | 05438afca79176f77aff274a624675bb3b9e231e (patch) | |
| tree | 9bf75c1b847b8610ea57a45d06f2b05497168175 /t/t4150-am.sh | |
| parent | t5520: test no merge candidates cases (diff) | |
| download | tgif-05438afca79176f77aff274a624675bb3b9e231e.tar.xz | |
t5520: test for failure if index has unresolved entries
Commit d38a30d (Be more user-friendly when refusing to do something
because of conflict., 2010-01-12) introduced code paths to git-pull
which will error out with user-friendly advices if the user is in the
middle of a merge or has unmerged files.
Implement tests to ensure that git-pull will not run, and will print
these advices, if the user is in the middle of a merge or has unmerged
files in the index.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
0 files changed, 0 insertions, 0 deletions