Add merge conflict seperator faces in diff view.
Allowing to select the remote and the branch pulling from.

This is a first stab at fixing issue #435.
Fixed a few typos.
Add ERT as git submodule
Add mocker.el as git submodule
Add tests/run-test.el
Use tests/run-test.el from Makefile
Add .travis.yml
Removed an unused `format`.
Placed the options in the right place for `pull`.

Copying the code from `magit-push` was not possible because `magit-pull` is less flexible with its options.
For `magit-push` the options can be passed after the `repository` and the `refspec`.
However, at least for `--rebase`, `magit-pull` does not accept this format.
Fix incorrect cursor location in magit-key-mode

After setting an argument value, point would be in the wrong spot. Fix
this by saving which option point is at before redrawing, then jumping
to that option after redrawing. Add a new function
magit-key-mode-build-exec-point-alist to help with this.
magit-guess-branch: fix recently introduced bug

Previously the while loop did not check for the end of the processed
list causing an error when trying to use the car of an empty list as
a string.
Merge commit 'ace86fd'
Merge commit '543b5db7ac0765b560d63ef136121752389dd386' into tarsius/master
Merge branch 'tarsius/master'
magit.el: improve doc-strings

This mostly just addresses issues that can easily be fixed (like using
imperative form, fixing punctuation and indention, fitting the first
sentence on the first line).
magit.el: improve doc-strings

This mostly just addresses issues that can easily be fixed (like using
imperative form, fixing punctuation and indention, fitting the first
sentence on the first line).
Merge branch 'maint'

Conflicts:
	magit.el
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