Mercurial > hg

annotate tests/test-simplemerge.py.out @ 28793:d30fdd6d1bf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial: add editorconfig Editorconfig (http://editorconfig.org/) is a file format helping define coding styles like spaces, tabs etc. It supports a wide range of editors. Some well- known projects like ruby and zsh are using it already. This patch adds a simple .editorconfig, making it clear we use 8-char tabs in C code, 4-char spaces in Python code, and we don't keep trailing spaces.
author Jun Wu <quark@fb.com>
date Tue, 05 Apr 2016 18:10:33 +0100
parents f18830651811
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 4363
diff changeset
1 ................
4363
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 ----------------------------------------------------------------------
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 4363
diff changeset
3 Ran 16 tests in 0.000s
4363
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
5 OK