Conflict History is a pretty basic mashup. Nothing big really. Simply document every war and battle around the world over the last 5000 years or so.
Taking advantage of the Google Maps interface, Conflict History does a great job of showing the relationship of time and place. The site has a useful search feature as well as a slider across the bottom that allows you to browse by date.
Clicking a specific map area or on the list of battles to the left pops open a window with battle specific information. While much of the information is taken from Wikipedia articles, Conflict History does a good job of organizing the textual data.
The site seems like a handy place for you and students to track down basic battle data or for you to highlight geographic places during a guided lecture.
If nothing else, it’s a great place for history buffs to spend an hour or two!