comparison .hgignore @ 53:336164c9a983

fixed the conflict
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Mon, 20 Oct 2008 20:54:15 +0800
parents 7f935bdc01b6
children 142d888af2d1
comparison
equal deleted inserted replaced
52:d2ac1e198ce4 53:336164c9a983
1 syntax: glob 1 syntax: glob
2 cookies.txt 2 .eagleeye.pm
3 .hgignore
3 ikariam.sqlite 4 ikariam.sqlite
4 perl 5 perl
5 samples 6 samples
6 sheep.sh
7 sheep.txt
8 *.html 7 *.html
9 *.sh 8 *.sh
10 *.txt 9 *.txt