Files
git/Documentation
Junio C Hamano d88949d86e Merge branch 'tg/rerere-doc-updates'
Clarify a part of technical documentation for rerere.

* tg/rerere-doc-updates:
  rerere: add note about files with existing conflict markers
  rerere: mention caveat about unmatched conflict markers
2018-09-17 13:53:57 -07:00
..
2018-09-10 10:41:56 -07:00
2018-09-17 13:53:55 -07:00
2018-06-25 13:22:36 -07:00
2018-05-23 14:38:22 +09:00
2018-06-27 10:29:10 -07:00
2018-08-01 13:37:18 -07:00
2018-09-17 13:53:55 -07:00
2017-06-27 10:35:49 -07:00
2018-08-17 15:18:01 -07:00
2018-06-01 15:06:37 +09:00
2018-04-18 12:49:26 +09:00