Added "--" divider to ensure that diff can disambiguate revision and filename.
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.
Pass through git's log colorization using ansi-color-apply to translate into text properties
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
Add dired-jump support to magit-status-mode.
README.md: fix link to Magit Owners Team

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
README.md: remove reference to outdated cheatsheet

The cheatsheet lists keybindings as they were in 2009, but they have
changed since.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Merge commit 'c48369b'

install C-x C-j only once dired-x is loaded
Merge branch 'maint'
Merge commit 'fdcc697'
adding contributing guidelines
Merge branch 'maint'
Make magit-save-buffers on magit-status use the directory we are
opening, not the default directory of the buffer we are visiting when
called.
Correct documentation for creating branch

It is b c instead of b n