Make sure we error out if we can't remove a file on automatic merges.
[git/mingw.git] / epoch.h
blob585110bdd62b69b61b2ac55fb2c7401a986346a5
1 #ifndef EPOCH_H
2 #define EPOCH_H
5 // return codes for emitter_func
6 #define STOP 0
7 #define CONTINUE 1
8 #define DO 2
9 typedef int (*emitter_func) (struct commit *);
11 int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter);
13 #define UNINTERESTING (1u<<2)
14 #define BOUNDARY (1u<<3)
15 #define VISITED (1u<<4)
16 #define DISCONTINUITY (1u<<5)
17 #define DUPCHECK (1u<<6)
20 #endif /* EPOCH_H */