summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-27 11:36:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-27 11:36:43 -0700
commit9f5df6fa670938a505a64edf1b779b1326311481 (patch)
tree2c0081a3816b1ba8e580d3120ed2e00e2f9173b5 /git-gui/lib/merge.tcl
parentMerge branch 'cn/format-patch-quiet' (diff)
parentdate: avoid "X years, 12 months" in relative dates (diff)
downloadtgif-9f5df6fa670938a505a64edf1b779b1326311481.tar.xz
Merge branch 'mg/x-years-12-months'
* mg/x-years-12-months: date: avoid "X years, 12 months" in relative dates
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions