summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:33:03 (GMT)
commit7591e2c53c6f02626e376a98b5f95745fbfe108f (patch)
tree59247b35b3873270f64d10e158f419a7fb177fbc /builtin/merge.c
parentce33d610969d2d39db3c3fe99fe5bae89dfab75a (diff)
parent0ae0e882b2dd8048e2096138561f0b2ab0cad454 (diff)
downloadgit-7591e2c53c6f02626e376a98b5f95745fbfe108f.zip
git-7591e2c53c6f02626e376a98b5f95745fbfe108f.tar.gz
git-7591e2c53c6f02626e376a98b5f95745fbfe108f.tar.bz2
Merge branch 'po/error-message-style'
* po/error-message-style: doc: give some guidelines for error messages
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions