diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
commit | aa2a7dad59c0db8b15aadbb58a861237a36c95ee (patch) | |
tree | d55ab82ba5c5195b003f9b29c2c17646fffbdae6 /vendor/gitignore/Global/Mercurial.gitignore | |
parent | b99471ca5de6e867c44ea21bf85252cd174ccec7 (diff) | |
parent | c002a560afae7db6a5c778bc78028243c2fc945a (diff) | |
download | gitlab-ce-aa2a7dad59c0db8b15aadbb58a861237a36c95ee.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
# app/assets/stylesheets/pages/issuable.scss
Diffstat (limited to 'vendor/gitignore/Global/Mercurial.gitignore')
-rw-r--r-- | vendor/gitignore/Global/Mercurial.gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vendor/gitignore/Global/Mercurial.gitignore b/vendor/gitignore/Global/Mercurial.gitignore new file mode 100644 index 00000000000..e65d1137988 --- /dev/null +++ b/vendor/gitignore/Global/Mercurial.gitignore @@ -0,0 +1,6 @@ +.hg/ +.hgignore +.hgsigs +.hgsub +.hgsubstate +.hgtags |