diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-27 09:59:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-27 09:59:19 -0800 |
commit | c054ef9be2dd1ea722130628b2feb46d0ac88f6d (patch) | |
tree | 831f1ef6a294c5840cc1db4c8987ea610d5dd2b0 /git-merge-one-file.sh | |
parent | 31e54bb94a8acb0fa4fa5099bc455ea8355db621 (diff) | |
parent | 7f1b69763272f9d07e612309f53190da0c97ca70 (diff) | |
download | git-c054ef9be2dd1ea722130628b2feb46d0ac88f6d.tar.gz git-c054ef9be2dd1ea722130628b2feb46d0ac88f6d.tar.xz |
Merge branch 'jn/less-reconfigure' into maint
* jn/less-reconfigure:
Makefile: avoid infinite loop on configure.ac change
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions