Added "--" divider to ensure that diff can disambiguate revision and filename.
Add merge conflict seperator faces in diff view.
Handle symlinks in magit-filename

The topdir is derived from `magit-get-top-dir`, which expands any
symlinks in the directory path, so file should use `file-truename` to do
the same instead of `expand-file-name`.
bugfix: make interactive-rebase respect server-name

* magit.el (magit-interactive-rebase): set $GIT_EDITOR to respect
  current socket-name value

this fixes a bug when the running emacsclient instance has been invoked
with a non-default socket-name
Run git init with no argument in the correct directory

When run in the correct directory, git init don't need an argument,
giving this argument make git fail when the repository is
remote (through tramp)
Merge branch 'maint'
magit-wip-mode now actually toggles use of wip refs

External git-wip.el (which did not provide a feature) is replaced with
magit-wip-save which uses magit-run-git.  Also add options to add control
commit and echo area messages, and improve doc-strings and commentary.
magit-wip: distinct modes for displaying and committing
global-magit-wip-save-mode: use magit.extensions mechanism
fix turn-on-magit-wip-save
add kludge for issue #441
add myself as maintainer

so people know who to contact in case of problems
fix typo
improve magit-wip usage information
minor commentary fixes
turn-on-magit-wip-save: assert git-wip is available
fix byte-compilation issue
Merge branch 'tarsius/magit-wip'
Merge commit '41101b951a29bdad781542ff17de6dc6af52ce5a' into suhailshergill/bugfix
Merge branch 'suhailshergill/bugfix'