@inproceedings{SANER-2016-NishimuraM,
	author        = "Yuichi Nishimura and Katsuhisa Maruyama",
	booktitle     = "{Proceedings of the 23rd International Conference on Software Analysis, Evolution and Reengineering}",
	doi           = "10.1109/SANER.2016.46",
	isbn          = "978-1-5090-1855-0",
	pages         = "661--664",
	publisher     = "{IEEE Computer Society}",
	title         = "{Supporting Merge Conflict Resolution by Using Fine-Grained Code Change History}",
	year          = 2016,
}