![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800) | ||
| commit | eb3b8d7658331f4ec5f115d7407393d845644f5e | |
| tree | 2ff9a37138583242a41fc213d7e6f47789dc7610 | tree | snapshot |
| parent | 406da7803217998ff6bf5dc69c55b1613556c2f4 | commit | diff |
| parent | aad2a07cfcdc89fd63bf28a2ac2873712fb25e43 | commit | diff |
Merge branch 'js/merge-edit-option'
* js/merge-edit-option:
Documentation: fix formatting error in merge-options.txt
* js/merge-edit-option:
Documentation: fix formatting error in merge-options.txt