Sung Won Cho 8f54e3b3e6 Fix conflict report format (#237) ... * Improve assert output * Get editor input as is * Avoid appending a linebreak to a normal diff * Test multi-line conflict diff		2019-07-30 18:57:23 +10:00
..
editor.go	Fix conflict report format (#237)	2019-07-30 18:57:23 +10:00
editor_test.go	Allow multiple editor sessions (#221)	2019-07-13 13:02:09 +10:00
terminal.go	Improve package structure (#207)	2019-06-25 19:20:19 +10:00