diff options
| author |  Richard Hansen <rhansen@bbn.com> | 2013-05-16 18:26:00 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-16 16:40:00 -0700 |
| commit | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (patch) | |
| tree | 869014b7d8899375bf0816b337025639096d1dff /git-remote-testpy.py | |
| parent | Git 1.8.2.3 (diff) | |
| download | tgif-66fa1b2c354f79ed48f5986ee700ccb2d167ccbf.tar.xz | |
Documentation/merge-options.txt: restore `-e` option
It looks like commit f8246281af9adb0fdddbcc90d2e19cb5cd5217e5
unintentionally removed the documentation for the `-e` option.
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-remote-testpy.py')
0 files changed, 0 insertions, 0 deletions