diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:37 -0700 |
| commit | bb52e7f600c9732c624ffc27f8321f55c4b4d90b (patch) | |
| tree | 067f898b3e11d5453db20e3b521d84711bfff93d /git-merge-resolve.sh | |
| parent | 334dde8532c68dfcadefbc3a7d96a499c0ec1445 (diff) | |
| parent | 5d86861c925f15676a14b54062725eb11a85ffbc (diff) | |
| download | git-bb52e7f600c9732c624ffc27f8321f55c4b4d90b.tar.gz | |
Merge branch 'jc/am-report-3way'
When "git am -3" needs to fall back to an application to a synthesized
preimage followed by a 3-way merge, the paths that needed such treatment
are now reported to the end user, so that the result in them can be
eyeballed with extra care.
* jc/am-report-3way:
am -3: list the paths that needed 3-way fallback
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions