Staging
v0.8.1
v0.8.1
Revision 2f834f20615d5b69b8476aea533de549808d993f authored by Éric Araujo on 28 July 2011, 20:45:46 UTC, committed by Éric Araujo on 28 July 2011, 20:45:46 UTC
R. David Murray and I think that it’s more useful to have these files show up in the output of “hg status”, to let the user know that some merged file have to be checked before commit. If you want to ignore these files in your clones, it’s possible to do so from another ignore file; see the bug report for directions. I’m leaving the .gitignore file alone, as I don’t know how git users work with merges and conflicts.
1 parent 5c8545b
File | Mode | Size |
---|---|---|
Doc | ||
Grammar | ||
Include | ||
Lib | ||
Mac | ||
Misc | ||
Modules | ||
Objects | ||
PC | ||
PCbuild | ||
Parser | ||
Python | ||
Tools | ||
.bzrignore | -rw-r--r-- | 602 bytes |
.gitignore | -rw-r--r-- | 610 bytes |
.hgeol | -rw-r--r-- | 650 bytes |
.hgignore | -rw-r--r-- | 900 bytes |
.hgtags | -rw-r--r-- | 4.4 KB |
LICENSE | -rw-r--r-- | 14.2 KB |
Makefile.pre.in | -rw-r--r-- | 42.4 KB |
README | -rw-r--r-- | 6.4 KB |
configure | -rwxr-xr-x | 398.1 KB |
configure.in | -rw-r--r-- | 122.7 KB |
install-sh | -rwxr-xr-x | 7.0 KB |
pyconfig.h.in | -rw-r--r-- | 33.9 KB |
setup.py | -rw-r--r-- | 80.3 KB |
Computing file changes ...