dnote/pkg/cli/cmd/sync
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
..
merge.go Fix conflict report format (#237) 2019-07-30 18:57:23 +10:00
merge_test.go Fix conflict report format (#237) 2019-07-30 18:57:23 +10:00
sync.go Fix conflict report format (#237) 2019-07-30 18:57:23 +10:00
sync_test.go Improve package structure (#207) 2019-06-25 19:20:19 +10:00