master updated (9fafeb2a66 -> 1424342225)

[Sean Whitton]

spwhitton pushed a change to branch master.

      from  9fafeb2a66 Ensure that we are not aset-ing Lisp records in 
purespace.
       new  962bdfcdfe vc-git-checkin: Offer to unstage conflicting changes
       new  1424342225 vc-git-checkin: Don't try to apply an empty patch


Summary of changes:
 lisp/vc/vc-git.el | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)