diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2011-08-04 16:08:59 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-04 15:40:41 -0700 |
| commit | 38ef61cfde8aea0864e898d37ce3213a5771c59e (patch) | |
| tree | 154072130363764b1b02265ea54e48b485588a11 /t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master | |
| parent | Merge branch 'mk/grep-pcre' (diff) | |
| download | tgif-38ef61cfde8aea0864e898d37ce3213a5771c59e.tar.xz | |
advice: Introduce error_resolve_conflict
Enable future callers to report a conflict and not die immediately by
introducing a new function called error_resolve_conflict.
Re-implement die_resolve_conflict as a call to error_resolve_conflict
followed by a call to die. Consequently, the message printed by
die_resolve_conflict changes from
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree ...
...
to
error: 'commit' is not possible because you have unmerged files.
hint: Fix them up in the work tree ...
hint: ...
fatal: Exiting because of an unresolved conflict.
Hints are printed using the same advise function introduced in
v1.7.3-rc0~26^2~3 (Introduce advise() to print hints, 2010-08-11).
Inspired-by: Christian Couder <chistian.couder@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master')
0 files changed, 0 insertions, 0 deletions