Merge branch 'master' into next
Make magit-ediff-restore work when there is several diff open at once.

We use local-variable set in the ediff control buffer by the
startup-hook, and the ediff-cleanup-hook in place of ediff-quit-hook.
Added one forgotten startup-hook in magit-ediff*
When merging conflict, use ediff handling of merged file
When solving conflict, ask ediff to look only at conflicting part of files
In magit-show, save file-name and version of the shown file
An interactive function to save current buffer as content of the index
in magit-ediff-restore, before killing the index, offer to stage it
Add my copyright
Fix magit-guess-branch: do not return t

For example, an error occurred when magit-guess-branch is returning t
in magit-default-rev.  This patch fixes the problem.
Merge pull request #537 from tkf/fix-magit-guess-branch

Fix magit-guess-branch: do not return t
Merge branch 'master' into next
magit-section-context-type: de-uglify
magit-prefix-p: improve doc-string

The old doc-string wasn't very precise, e.g. it left out that `equal'
is used for comparison.

Also rename arguments;  It just doesn't feel right to say.

  PREFIX is a prefix ... if ...

The hole point of this function is to check whether the first list is
a prefix of the second.  It might very well not be, so let's just call
it a list.
add new function magit-section-match
refactor magit-section-case and related functions

`magit-section-case' used to return t if a clause succeeds but the
value of it's body is nil.  This was due to internal needs; it allowed
`run-hook-with-args-until-sucess' to detect that a clause and therefor
the hook function succeeded.  However, while it was documented in the
doc-string, callers should not have to deal with this.

* `magit-section-case' and `magit-section-action' always return
  the value of the BODY now.  In other words they can return nil.
* `magit-section-case' doesn't need to know about OPCODE.
  Running the OPCODE hook is done in `magit-section-action' now.
* `magit-add-section' wrap each BODY so that `magit-section-action'
  can detect whether a CLAUSE succeeded.  Previously that was done
  in `magit-section-case' for *any* CLAUSE.
* Disallow a t/otherwise CLAUSE in `magit-section-action' as that
  would prevent the OPCODE hook from running.
* Replace uses of `magit-section-action' without OPCODE to use
  `magit-section-case' instead.
rename magit-add-action{ => -clauses}